Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2013-01-03 16:43:07 +05:30
parent a2578335c8
commit 214643208d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/translations.py
View File

@ -230,6 +230,7 @@ class GetTranslations(Translations): # {{{
def run(self, opts): def run(self, opts):
if not self.modified_translations: if not self.modified_translations:
subprocess.check_call(['bzr', 'merge', self.BRANCH]) subprocess.check_call(['bzr', 'merge', self.BRANCH])
subprocess.check_call(['bzr', 'resolve', '--take-other'])
self.check_for_errors() self.check_for_errors()
if self.modified_translations: if self.modified_translations: