diff options
| author | Georg Brandl <georg@python.org> | 2009-03-30 21:21:05 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-03-30 21:21:05 (GMT) |
| commit | d687887b536bf1674ac45f78bb77b346aa2b7687 (patch) | |
| tree | e499c91c2f57b3ca6bf16f650c9e53a3964fc1ee /Doc/license.rst | |
| parent | 0961354874ef12adc86140d0ffb28a35bd223383 (diff) | |
| download | cpython-d687887b536bf1674ac45f78bb77b346aa2b7687.zip cpython-d687887b536bf1674ac45f78bb77b346aa2b7687.tar.gz cpython-d687887b536bf1674ac45f78bb77b346aa2b7687.tar.bz2 | |
Remove merging leftover.
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index faceab6..7ae9f56 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? | +================+==============+============+============+=================+ |