ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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"
This commit is contained in:
l10n daemon script
2020-10-25 05:12:30 +01:00
parent dfec20f0f2
commit a787d1a21d
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
linux/org.eu.encom.spectral.desktop
View File

@@ -7,4 +7,3 @@ Terminal=false
Icon=org.eu.encom.spectral Icon=org.eu.encom.spectral
Type=Application Type=Application
Categories=Network;InstantMessaging; Categories=Network;InstantMessaging;
Name[en_US]=Spectral