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"
11 years ago · 30b46f9506
parent 728d2e3786
commit 30b46f9506
2 changed files with 2 additions and 2 deletions
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -333,4 +333,4 @@ Size=64
 Context=Status
 Type=Fixed

-########## EOF
+########## EOF
--- a/icons/index.theme
+++ b/icons/index.theme
@ -337,4 +337,4 @@ Size=64
 Context=Status
 Type=Fixed

-########## EOF
+########## EOF