From: Andrea-Paz <gamberucci.andrea@gmail.com>
Date: Tue, 28 May 2019 09:46:45 +0000 (+0200)
Subject: second add cha 8
X-Git-Tag: 2021-05~219^2~1
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=f0cf0cc29ce97b556f251bd799c06763d64f0e33;p=goodguy%2Fcin-manual-latex.git

second add cha 8
---

f0cf0cc29ce97b556f251bd799c06763d64f0e33
diff --cc CinelerraGG_Manual.tdo
index 1c18521,1dedb7b..bddf16e
--- a/CinelerraGG_Manual.tdo
+++ b/CinelerraGG_Manual.tdo
@@@ -1,1 -1,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