From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 7 Sep 2013 21:12:55 +0000 (-0700)
Subject: Fix the merge conflict
X-Git-Tag: v3.4.0a3~27^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eda7c641515f8af1f8700634b93eba859967379c;p=python

Fix the merge conflict
---

diff --git a/Lib/site.py b/Lib/site.py
index 0bb2ea0081..c4ea6f6adb 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -361,14 +361,8 @@ def setcopyright():
     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])