Skip to content

C
cpython
Commit 667ae931 authored by Georg Brandl's avatar Georg Brandl
Browse files
Options

Remove merging leftover.

parent a68430af
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
Doc/license.rst
View file @ 667ae931
...@@ -31,7 +31,6 @@ All Python releases are Open Source (see http://www.opensource.org/ for the Open ...@@ -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 Source Definition). Historically, most, but not all, Python releases have also
been GPL-compatible; the table below summarizes the various releases. been GPL-compatible; the table below summarizes the various releases.
<<<<<<< .working
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| Release | Derived from | Year | Owner | GPL compatible? | | Release | Derived from | Year | Owner | GPL compatible? |
+================+==============+============+============+=================+ +================+==============+============+============+=================+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7