Remove leftover svn conflict marker

diff --git a/Doc/license.rst b/Doc/license.rst
index 267999a156e892ee98b26937ad65434750852e6c..3fbece4348ed8382e684e5aed8f3910494c45bd2 100644 (file)
--- 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? |
 +================+==============+============+============+=================+