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?ds=sidebyside;hp=-c

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

df455ffa41784599b14547931a127560bd5be108
diff --combined main.tex
index 8b1835f,e8e1eca..02ff0ac
--- a/main.tex
+++ b/main.tex
@@@ -59,7 -59,7 +59,7 @@@ and Michel Salomon*\
  
  \section{Annotated-based Approach}
  % Main author : bassam
 -
 +\input{annotated}
  
  
  
@@@ -73,6 -73,7 +73,7 @@@
  
  
  \bibliographystyle{plain}
+ 
  \bibliography{biblio}