From 214643208ddacc7dfe079a78f330c724efd73f07 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Jan 2013 16:43:07 +0530
Subject: [PATCH] ...

---
 setup/translations.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/translations.py b/setup/translations.py
index 3942953179..e3622d394e 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -230,6 +230,7 @@ class GetTranslations(Translations): # {{{
     def run(self, opts):
         if not self.modified_translations:
             subprocess.check_call(['bzr', 'merge', self.BRANCH])
+        subprocess.check_call(['bzr', 'resolve', '--take-other'])
         self.check_for_errors()
 
         if self.modified_translations: