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"
10 lines
208 B
Desktop File
10 lines
208 B
Desktop File
[Desktop Entry]
|
|
Name=Spectral
|
|
GenericName=Matrix Client
|
|
Comment=IM client for the Matrix protocol
|
|
Exec=spectral
|
|
Terminal=false
|
|
Icon=org.eu.encom.spectral
|
|
Type=Application
|
|
Categories=Network;InstantMessaging;
|