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 · e6e94ebf83
parent ce85074194
commit e6e94ebf83
2 changed files with 2 additions and 2 deletions
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -237,4 +237,4 @@ Size=64
 Context=Status
 Type=Fixed

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

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