Commit 3618492e authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 7ed31f4f
...@@ -75,6 +75,7 @@ GenericName[sv]=En kapplöpning i hyperrymden ...@@ -75,6 +75,7 @@ GenericName[sv]=En kapplöpning i hyperrymden
GenericName[tr]=Sonsuz uzayda bir yarış GenericName[tr]=Sonsuz uzayda bir yarış
GenericName[uk]=Перегони у гіперпросторі GenericName[uk]=Перегони у гіперпросторі
GenericName[x-test]=xxA race in hyperspacexx GenericName[x-test]=xxA race in hyperspacexx
X-KDE-StartupNotify=true X-KDE-StartupNotify=true
Categories=Qt;KDE;Game;ArcadeGame; Categories=Qt;KDE;Game;ArcadeGame;
X-DBUS-StartupType=Multi X-DBUS-StartupType=Multi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment