Fix the merge conflict

diff --git a/Lib/site.py b/Lib/site.py
index 0bb2ea0081ed716d7ea7cb21e27a5abaea28775f..c4ea6f6adb9732afc31f6df749ffd3ba502c0e39 100644 (file)
--- 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])