resolve conflict readme

d77a0812 · jcomedouteau · 297380da · d77a0812 · d77a0812 · d77a0812
Commit d77a0812 authored Jan 07, 2016 by jcomedouteau
Showing with 0 additions and 20 deletions

etherpad_to_lexique/README.md etherpad_to_lexique/README.md +0 -6

etherpad_to_opale/README.md etherpad_to_opale/README.md +0 -7

etherpad_to_optim/README.md etherpad_to_optim/README.md +0 -7

No files found.
--- a/etherpad_to_lexique/README.md
+++ b/etherpad_to_lexique/README.md
@@ -4,16 +4,10 @@
 ## Credits
 - Rit Gabrielle
 - Vintache Jean
-<<<<<<< HEAD
 - Douteau Jean-Come
 - Fecherolle Cecile (2014)
-##Presentation
-=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)

 ## Presentation
->>>>>>> c48dac707699113384445195f6949017212e8164
 How to transform an etherpad document in lexique document.

 Filepath in this document are relative to this file readme.

--- a/etherpad_to_opale/README.md
+++ b/etherpad_to_opale/README.md
@@ -4,17 +4,10 @@
 ## Credits
 - Rit Gabrielle
 - Vintache Jean
-<<<<<<< HEAD
 - Douteau Jean-Come
 - Fecherolle Cecile (2014)
-##Presentation
-=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)

 ## Presentation
-
->>>>>>> c48dac707699113384445195f6949017212e8164
 How to transform an etherpad document in opale document.

 Filepaths in this document are relative to this readme file.

--- a/etherpad_to_optim/README.md
+++ b/etherpad_to_optim/README.md
@@ -4,18 +4,11 @@
 ## Credits
 - Rit Gabrielle
 - Vintache Jean
-<<<<<<< HEAD
 - Douteau Jean-Come
 - Fecherolle Cecile (2014)
-##Presentation
-=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)

 ## Presentation
->>>>>>> c48dac707699113384445195f6949017212e8164
 How to transform an etherpad document in optim document.
-
 Filepath in this document are relative to this file readme.

 ## Dependence