-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
5 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
<<<<<<< HEAD | ||
Copyright (c) 2011-2022, Till Sauerwein <[email protected]>, Konrad Förstner <[email protected]> | ||
======= | ||
|
||
READemption is open source software and available under the MIT license. | ||
>>>>>>> dev | ||
|
||
Copyright (c) 2011-2022, Konrad Förstner <[email protected]>, Till Sauerwein <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ __author__ = "Konrad Foerstner <[email protected]>, Till Sauerwein <sauerwein | |
__copyright__ = "2011-2022 by Konrad Foerstner <[email protected], , Till Sauerwein <[email protected]>" | ||
__license__ = "MIT License" | ||
__email__ = "[email protected], [email protected]" | ||
__version__ = "2.0.2" | ||
__version__ = "2.0.3" | ||
|
||
|
||
def main(): | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
|
||
setup( | ||
name="READemption", | ||
version="2.0.2", | ||
version="2.0.3", | ||
packages=["reademptionlib", "tests"], | ||
author="Konrad U. Förstner, Till Sauerwein", | ||
author_email="[email protected]", | ||
|