From: bassam al-kindy <bassam.al-kindy@lifc>
Date: Tue, 10 Sep 2013 10:40:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/chloroplast13
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/chloroplast13.git/commitdiff_plain/df455ffa41784599b14547931a127560bd5be108?hp=afcd264169a7a242f14231890b9ea057664909fd

Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/chloroplast13
---

diff --git a/annotated.tex b/annotated.tex
new file mode 100644
index 0000000..720adc5
--- /dev/null
+++ b/annotated.tex
@@ -0,0 +1 @@
+ sdfdfadqdqaaaaaaaaaaaaaaaaaaa
diff --git a/main.tex b/main.tex
index e8e1eca..02ff0ac 100755
--- a/main.tex
+++ b/main.tex
@@ -59,7 +59,7 @@ and Michel Salomon*\\
 
 \section{Annotated-based Approach}
 % Main author : bassam
-
+\input{annotated}