Commit d77a0812 authored by jcomedouteau's avatar jcomedouteau

resolve conflict readme

parent 297380da
......@@ -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.
......
......@@ -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.
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment