add cha 8

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

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