From e6e94ebf835009b89d83d971946002e38e856496 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Mar 2015 09:59:11 +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 ec8f00c4..36ac3e0a 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -237,4 +237,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 653b9924..117ba7cf 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -336,4 +336,4 @@ Size=64 Context=Status Type=Fixed -########## EOF \ No newline at end of file +########## EOF