Another minor fixes

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

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index bddf16e03e84a6d3c6ecd7973b90e36ab2db771e..f03a31e829baad3137ced5af25a0c92e0c9f60c1 100644 (file)
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1,5 +1,4 @@
-<<<<<<< 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
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 1}{185}{section*.52}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 2}{187}{section*.53}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ It's OK to use Subsection every plugin?}{199}{section*.54}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 3}{267}{section*.85}%