diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
| commit | df878cc2dc80ea09e09617949869ab7044d3c3c3 (patch) | |
| tree | 4ffb0d73d6e6b3403d01923b94b27628f566398e /tex/README.md | |
| parent | a6f5fcd6177b8f6319ffccddda1627f8b1dad415 (diff) | |
| parent | 82666074e0c921e53c21b9e2c444e9a2d407d092 (diff) | |
Imported recent changes in Maneage, minor conflicts fixed
A few small conflicts showed up here and there. They are fixed with this
merge.
Diffstat (limited to 'tex/README.md')
| -rw-r--r-- | tex/README.md | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/tex/README.md b/tex/README.md index 0f2f0d6..a87832a 100644 --- a/tex/README.md +++ b/tex/README.md @@ -45,15 +45,12 @@ be built. ### Copyright information -This project 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 project 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 project. If not, see <https://www.gnu.org/licenses/>.
\ No newline at end of file +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. + +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/>. |