aboutsummaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
commitd85dfdf8d7b0f2769d824fd4994eccec55db963a (patch)
tree93afba26310a300fe834ed5a74258ba0353fc862 /tex
parentfc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 (diff)
parenta69f2ce5624b0b683b793a2f4cb68c7023458f15 (diff)
Imported recent updated in Maneage, minor conflict fixed
The minor conflict was with 'reproduce/software/make/high-level.mk', and in particular because we implemented the fix to Maneage's Task #15664 in this project first. After it was moved to the main Maneage branch some minor stylistic corrections were done to it, thus causing the conflict. To resolve the conflict, I simply imported the full Maneage version of the file with this command: git checkout maneage -- reproduce/software/make/high-level.mk The other conflicts were due to the deleted files (that were resolved as described in 'README-hacking.md') and the LaTeX files that I had told '.gitattributes' to ignore from the Maneage branch.
Diffstat (limited to 'tex')
-rw-r--r--tex/README.md20
1 files changed, 12 insertions, 8 deletions
diff --git a/tex/README.md b/tex/README.md
index a87832a..12a19fc 100644
--- a/tex/README.md
+++ b/tex/README.md
@@ -44,13 +44,17 @@ be built.
### Copyright information
+This file is part of Maneage (https://maneage.org).
-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 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.
-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/>.
+This file 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 <http://www.gnu.org/licenses/>.