Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r77785:baaee72e978a
Date: 2015-06-02 19:17 +0200
http://bitbucket.org/pypy/pypy/changeset/baaee72e978a/
Log: Remove merge conflict marker which was accidently left.
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -487,7 +487,6 @@
exename = exe.new(purebasename=exe.purebasename + 'w')
shutil_copy(str(exename), str(newexename))
ext_to_copy = ['lib', 'pdb']
->>>>>>> other
for ext in ext_to_copy:
name = soname.new(ext=ext)
newname = newexename.new(basename=soname.basename)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
