SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-10-25 05:12:30 +01:00
parent dfec20f0f2
commit a787d1a21d
1 changed files with 0 additions and 1 deletions
--- a/linux/org.eu.encom.spectral.desktop
+++ b/linux/org.eu.encom.spectral.desktop
@@ -7,4 +7,3 @@ Terminal=false
 Icon=org.eu.encom.spectral
 Type=Application
 Categories=Network;InstantMessaging;
-Name[en_US]=Spectral