projects
/
goodguy
/
cin-manual-latex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add cha 8
[goodguy/cin-manual-latex.git]
/
CinelerraGG_Manual.tdo
diff --git
a/CinelerraGG_Manual.tdo
b/CinelerraGG_Manual.tdo
index bddf16e03e84a6d3c6ecd7973b90e36ab2db771e..1dedb7b64ae124a4c9bc470f901895cd7420d96a 100644
(file)
--- 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}%
\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ First char should be capitalised}{138}{section*.42}%
->>>>>>> einhander