Imported recent changes in Maneage, minor conflicts fixed

A few small conflicts showed up here and there. They are fixed with this
merge.

1 files changed, 9 insertions, 9 deletions

diff --git a/project b/project
index e2d4c66..efbd266 100755
--- a/project
+++ b/project
@@ -5,15 +5,15 @@
 #
 # Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 #
-# This script is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# This file is part of Maneage. Maneage is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later version.
 #
-# This script is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details. See <http://www.gnu.org/licenses/>.
+# Maneage is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details. See <http://www.gnu.org/licenses/>.
 
 
 # Basic settings
@@ -114,7 +114,7 @@ Make options:
 Mandatory or optional arguments to long options are also mandatory or optional
 for any corresponding short options.
 
-Reproducible paper template: https://gitlab.com/makhlaghi/reproducible-paper
+Maneage URL: https://maneage.org
 
 Report bugs to mohammad@akhlaghi.org
 EOF