[Python-checkins] cpython: Fix the merge conflict

[senthil.kumaran]

http://hg.python.org/cpython/rev/6ecdf2b3192b
changeset:   85597:6ecdf2b3192b
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat Sep 07 14:12:55 2013 -0700
summary:
  Fix the merge conflict

files:
  Lib/site.py |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -361,14 +361,8 @@
     Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
     for supporting Python development.  See www.python.org for more information.""")
     here = os.path.dirname(os.__file__)
-<<<<<<< local
     builtins.license = _sitebuiltins._Printer(
         "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"],
         [os.path.join(here, os.pardir), here, os.curdir])
 

-- 
Repository URL: http://hg.python.org/cpython