sync local branch

[goodguy/cin-manual-latex.git] / CinelerraGG_Manual.tex

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index bf61addae801b7bb19795e82db64b2e58e6246b3..aae08534dfe4135d84a01351d50153d57d53c346 100644 (file)
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -32,6 +32,8 @@ svgnames
 \include{parts/Editing}
 \include{parts/Rendering}
 \include{parts/Keyframes}
+<<<<<<< HEAD
+=======
 
 
 \printnomenclature      % print glossary
@@ -45,5 +47,6 @@ svgnames
 \newpage
 
 \listoftodos
+>>>>>>> einhander
 
 \end{document}