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"
KDE · Nov 15, 2016 · af1e96a · af1e96a
1 parent dac37ef
commit af1e96a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/themes/pool.desktop b/themes/pool.desktop
@@ -25,6 +25,7 @@ Name[sr@latin]=Bilijar
 Name[sv]=Pool
 Name[uk]=Басейн
 Name[x-test]=xxPoolxx
+Name[zh_TW]=池
 FileName=pool.svgz
 Author=Claudio Canavese
 AuthorEmail=cod@cod-web.net