Imported recent work in Maneage, minor conflicts fixed

Some minor conflicts that came up during the merge were fixed.

1 files changed, 4 insertions, 3 deletions

diff --git a/paper.tex b/paper.tex
index c3d17a8..e8b7cc9 100644
--- a/paper.tex
+++ b/paper.tex
@@ -14,14 +14,15 @@
 %% assumed to be if you use `\includetikz' when `\makepdf' is not defined.
 \newcommand{\makepdf}{}
 
-%% Import the project's processing macros 'project.tex' and the
-%% Maneage-specific preambles.
+%% VALUES FROM ANALYSIS (NUMBERS AND STRINGS): this file is automatically
+%% generated at the end of the processing and includes LaTeX macros
+%% (defined with '\newcommand') for various processing outputs to be used
+%% within the paper.
 \input{tex/build/macros/project.tex}
 \input{tex/src/preamble-maneage.tex}
 
 %% Import the other necessary TeX files for this particular project.
 \input{tex/src/preamble-project.tex}
-\input{tex/src/preamble-pgfplots.tex}
 
 %% Title and author names.
 \title{\projecttitle}