diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-09-07 21:12:55 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-09-07 21:12:55 (GMT) |
| commit | eda7c641515f8af1f8700634b93eba859967379c (patch) | |
| tree | 8411faad9c79019da0887fe970c1ee26468715b3 /Lib | |
| parent | 2f2ae3903772263ef11d718b9112ae2036112f1b (diff) | |
| download | cpython-eda7c641515f8af1f8700634b93eba859967379c.zip cpython-eda7c641515f8af1f8700634b93eba859967379c.tar.gz cpython-eda7c641515f8af1f8700634b93eba859967379c.tar.bz2 | |
Fix the merge conflict
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/site.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Lib/site.py b/Lib/site.py index 0bb2ea0..c4ea6f6 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]) |