[Python-checkins] r71245 - python/branches/release30-maint/Doc/license.rst

[mark.dickinson]

Author: mark.dickinson
Date: Sun Apr  5 18:03:02 2009
New Revision: 71245

Log:
Remove leftover svn conflict marker


Modified:
   python/branches/release30-maint/Doc/license.rst

Modified: python/branches/release30-maint/Doc/license.rst
==============================================================================
--- python/branches/release30-maint/Doc/license.rst	(original)
+++ python/branches/release30-maint/Doc/license.rst	Sun Apr  5 18:03:02 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? |
 +================+==============+============+============+=================+