cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

let's unfuck those sprites

Browse Source
This commit is contained in:
Superhats
2018-08-28 19:33:02 +02:00
parent c18ca03c66
commit a275d91fef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/icon_merge_tool/icon_merge_tool.py
+1 -1
View File
@@ -60,7 +60,7 @@ def main(relative_root):
path = icon_conflicts[i]
print("{}: {}".format("Merging", path))
common_ancestor_hash = run_shell_command("git merge-base ORIG_HEAD master").strip()
common_ancestor_hash = run_shell_command("git merge-base MERGE_HEAD HEAD").strip()
ours_icon = NamedTemporaryFile(delete=False)
theirs_icon = NamedTemporaryFile(delete=False)