Remove merging leftover.

diff --git a/Doc/license.rst b/Doc/license.rst
index faceab68037984fb52ae641c82e649a83e2f3f4a..7ae9f567510429906a387b932c41c7bc89f120d2 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? |
 +================+==============+============+============+=================+