second add cha 8

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

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index 1c185214d3918b9fb894ab507c1b031ce5196d52..bddf16e03e84a6d3c6ecd7973b90e36ab2db771e 100644 (file)
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1 +1,5 @@
+<<<<<<< HEAD
 \contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ First char should be capitalised}{140}{section*.43}% 
+=======
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ First char should be capitalised}{138}{section*.42}% 
+>>>>>>> einhander