Add *.tdo file to ignore

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

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index bddf16e03e84a6d3c6ecd7973b90e36ab2db771e..72a5f5c81e976875350cbff830f0e291a3b7dcc4 100644 (file)
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1,5 +1,2 @@
-<<<<<<< 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}}\ Link to Overlay Modes chapter}{92}{section*.23}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ Link to Overlay Modes chapter}{267}{section*.83}%