diff --git a/LICENSE.txt b/LICENSE.txt index d3a5080a..ecee1062 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,8 +1,5 @@ -<<<<<<< HEAD -Copyright (c) 2011-2022, Till Sauerwein , Konrad Förstner -======= + READemption is open source software and available under the MIT license. ->>>>>>> dev Copyright (c) 2011-2022, Konrad Förstner , Till Sauerwein diff --git a/Makefile b/Makefile index a4d4455b..ae688480 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ new_release: @echo " git checkout dev" @echo "* Change version and date in bin/reademption" @echo "* Change version in setup.py" + @echo "* Change the version and date in .zenodo.json" @echo "* Change requirements (install_requires) in setup.py" @echo "* Change version, release and date in docs/source/conf.py" @echo "* Add description to CHANGELOG.txt" diff --git a/bin/reademption b/bin/reademption index d0a32adb..759c0d00 100755 --- a/bin/reademption +++ b/bin/reademption @@ -9,7 +9,7 @@ __author__ = "Konrad Foerstner , Till Sauerwein