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/src | |
| 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/src')
| -rw-r--r-- | tex/src/preamble-biblatex.tex | 19 | ||||
| -rw-r--r-- | tex/src/preamble-pgfplots.tex | 19 | ||||
| -rw-r--r-- | tex/src/preamble-style.tex | 1 |
3 files changed, 16 insertions, 23 deletions
diff --git a/tex/src/preamble-biblatex.tex b/tex/src/preamble-biblatex.tex index fbf72ce..0561d1c 100644 --- a/tex/src/preamble-biblatex.tex +++ b/tex/src/preamble-biblatex.tex @@ -14,18 +14,15 @@ % %% Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> % -%% This template 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 LaTeX 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 template 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 template. If not, 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/>. diff --git a/tex/src/preamble-pgfplots.tex b/tex/src/preamble-pgfplots.tex index 04affbd..0a7b5d5 100644 --- a/tex/src/preamble-pgfplots.tex +++ b/tex/src/preamble-pgfplots.tex @@ -42,18 +42,15 @@ % %% Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> % -%% This template 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 LaTeX 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 template 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 template. If not, 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/>. diff --git a/tex/src/preamble-style.tex b/tex/src/preamble-style.tex index 592d97e..f8b95d6 100644 --- a/tex/src/preamble-style.tex +++ b/tex/src/preamble-style.tex @@ -29,7 +29,6 @@ basicstyle=\small\ttfamily, } - %% To allow a prefix to the enumeration. \usepackage{enumitem} \setlist{nolistsep} % No space before `\begin{itemize}' |