From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 5 Apr 2009 16:03:02 +0000 (+0000)
Subject: Remove leftover svn conflict marker
X-Git-Tag: 3.0~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1ddae972564b4ce02a10b99aff5974d9bde9bac;p=thirdparty%2FPython%2Fcpython.git

Remove leftover svn conflict marker
---

diff --git a/Doc/license.rst b/Doc/license.rst
index 267999a156e8..3fbece4348ed 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -31,7 +31,6 @@ All Python releases are Open Source (see http://www.opensource.org/ for the Open
 Source Definition). Historically, most, but not all, Python releases have also
 been GPL-compatible; the table below summarizes the various releases.
 
-<<<<<<< .working
 +----------------+--------------+------------+------------+-----------------+
 | Release        | Derived from | Year       | Owner      | GPL compatible? |
 +================+==============+============+============+=================+