Remove merging leftover.

d687887b · Georg Brandl · 09613548 · d687887b
Kaydet (Commit) d687887b authored Mar 30, 2009 tarafından Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

license.rst Doc/license.rst +0 -1

No files found.
--- 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? |
 +================+==============+============+============+=================+