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, 12 deletions

diff --git a/paper.tex b/paper.tex
index 43f35c8..1f5c037 100644
--- a/paper.tex
+++ b/paper.tex
@@ -88,6 +88,7 @@
 
 
 
+
 \section{Introduction}
 \label{sec:introduction}
 
@@ -707,18 +708,14 @@ The authors have no competing interests to declare.
 %% Finish LaTeX
 \end{document}
 
-%% This file is part of a paper describing the Maneage workflow system
-%%   https://maneage.org
+%% This file is part of Maneage (https://maneage.org).
 %
-%% This file 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 file is distributed in the hope that it will be useful, but WITHOUT
+%% 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.
-%
-%% You should have received a copy of the GNU General Public License along
-%% with this file.  If not, see <https://www.gnu.org/licenses/>.
+%% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+%% more details. See <http://www.gnu.org/licenses/>.