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

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index 1c18521..bddf16e 100644
--- 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