X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=inline;f=CinelerraGG_Manual.tdo;h=6fced7d5413f6a05821dff2feb9a8cf101802540;hb=0d50c1e15384db1c21627c9c98f1011cd03c38c2;hp=d0dba1d64140c0789cb5c7ac49a5ad78c0efc3dc;hpb=c1b0e069cc1949d08daf3800c7ea461b5890aa37;p=goodguy%2Fcin-manual-latex.git

diff --git a/CinelerraGG_Manual.tdo b/CinelerraGG_Manual.tdo
index d0dba1d..6fced7d 100644
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@ -1,6 +1,14 @@
+<<<<<<< HEAD
 \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}}\ I can't to remedy}{191}{section*.54}% 
-\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ It's OK to use Subsection every plugin?}{199}{section*.55}% 
-\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 3}{266}{section*.86}% 
-\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ How make a new line into the link?}{302}{section*.108}% 
+\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}{266}{section*.85}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ How make a new line into the link?}{302}{section*.107}% 
+=======
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 1}{181}{section*.52}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 2}{183}{section*.53}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ I can't to remedy}{187}{section*.54}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ It's OK to use Subsection every plugin?}{195}{section*.55}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ internal link 3}{263}{section*.86}% 
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ How make a new line into the link?}{299}{section*.108}% 
+>>>>>>> fca0231... minor adds to cha 9