X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcin-manual-latex.git;a=blobdiff_plain;f=CinelerraGG_Manual.tdo;h=1dedb7b64ae124a4c9bc470f901895cd7420d96a;hp=bddf16e03e84a6d3c6ecd7973b90e36ab2db771e;hb=debff500fcf4f806111f4f026f9ce44827270acc;hpb=f0cf0cc29ce97b556f251bd799c06763d64f0e33

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index bddf16e..1dedb7b 100644
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1,5 +1 @@
-<<<<<<< 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