From 30b46f950685e0cd7cd72a6d9890296b4a6d1bf9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jun 2015 10:41:50 +0000 Subject: [PATCH] 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" --- icons-dark/index.theme | 2 +- icons/index.theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 0ac3a55e..0f39a152 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -333,4 +333,4 @@ Size=64 Context=Status Type=Fixed -########## EOF \ No newline at end of file +########## EOF diff --git a/icons/index.theme b/icons/index.theme index aa0a65f8..ff69fedd 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -337,4 +337,4 @@ Size=64 Context=Status Type=Fixed -########## EOF \ No newline at end of file +########## EOF