From d687887b536bf1674ac45f78bb77b346aa2b7687 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 30 Mar 2009 21:21:05 +0000 Subject: [PATCH] Remove merging leftover. --- Doc/license.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/Doc/license.rst b/Doc/license.rst index faceab68037..7ae9f567510 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? | +================+==============+============+============+=================+