Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix the merge conflict

This commit is contained in:
Senthil Kumaran 2013-09-07 14:12:55 -07:00
parent 2f2ae39037
commit eda7c64151
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/site.py
View File

@ -361,14 +361,8 @@ def setcopyright():
Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
for supporting Python development. See www.python.org for more information.""") for supporting Python development. See www.python.org for more information.""")
here = os.path.dirname(os.__file__) here = os.path.dirname(os.__file__)
<<<<<<< local
builtins.license = _sitebuiltins._Printer( builtins.license = _sitebuiltins._Printer(
"license", "See http://www.python.org/%.3s/license.html" % sys.version, "license", "See http://www.python.org/%.3s/license.html" % sys.version,
=======
builtins.license = _Printer(
"license",
"See http://www.python.org/download/releases/%.5s/license/" % sys.version,
>>>>>>> other
["LICENSE.txt", "LICENSE"], ["LICENSE.txt", "LICENSE"],
[os.path.join(here, os.pardir), here, os.curdir]) [os.path.join(here, os.pardir), here, os.curdir])