X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcin-manual-latex.git;a=blobdiff_plain;f=CinelerraGG_Manual.tex;h=aae08534dfe4135d84a01351d50153d57d53c346;hp=bf61addae801b7bb19795e82db64b2e58e6246b3;hb=3c43ca86e49da3eeb7e52a7ed5ae5f69c581e2a3;hpb=7af20118e92709c3ab806dc639910fb0b9af78be

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index bf61add..aae0853 100644
--- 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}