From d1ddae972564b4ce02a10b99aff5974d9bde9bac Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 5 Apr 2009 16:03:02 +0000 Subject: [PATCH] Remove leftover svn conflict marker --- Doc/license.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/Doc/license.rst b/Doc/license.rst index 267999a156e8..3fbece4348ed 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? | +================+==============+============+============+=================+ -- 2.47.3