Skip to content

Commit

Permalink
FIX do not open the merged file, delegate this to pbxproj.write
Browse files Browse the repository at this point in the history
This makes sure that the right codec is choosen.
  • Loading branch information
simonwagner committed Feb 8, 2014
1 parent 4f109f2 commit 2fcb99e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/mergepbx.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ def merge_pbx_files(basef, minef, theirsf, mergedf):

merged_project = merge_pbxs(base, mine, theirs)

mergedf = open(mergedf, "w")
pbxproj.write(mergedf, merged_project)

def read_pbxs(pbx_files):
Expand Down

0 comments on commit 2fcb99e

Please sign in to comment.