[Python-checkins] r70753 - python/branches/py3k/Doc/license.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Mar 30 23:21:05 2009
New Revision: 70753

Log:
Remove merging leftover.

Modified:
   python/branches/py3k/Doc/license.rst

Modified: python/branches/py3k/Doc/license.rst
==============================================================================
--- python/branches/py3k/Doc/license.rst	(original)
+++ python/branches/py3k/Doc/license.rst	Mon Mar 30 23:21:05 2009
@@ -31,7 +31,6 @@
 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? |
 +================+==============+============+============+=================+