From: Georg Brandl <georg@python.org>
Date: Mon, 30 Mar 2009 21:21:05 +0000 (+0000)
Subject: Remove merging leftover.
X-Git-Tag: v3.1a2~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d687887b536bf1674ac45f78bb77b346aa2b7687;p=python

Remove merging leftover.
---

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