Commit d77a0812 authored by jcomedouteau's avatar jcomedouteau

resolve conflict readme

parent 297380da
...@@ -4,16 +4,10 @@ ...@@ -4,16 +4,10 @@
## Credits ## Credits
- Rit Gabrielle - Rit Gabrielle
- Vintache Jean - Vintache Jean
<<<<<<< HEAD
- Douteau Jean-Come - Douteau Jean-Come
- Fecherolle Cecile (2014) - Fecherolle Cecile (2014)
##Presentation
=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)
## Presentation ## Presentation
>>>>>>> c48dac707699113384445195f6949017212e8164
How to transform an etherpad document in lexique document. How to transform an etherpad document in lexique document.
Filepath in this document are relative to this file readme. Filepath in this document are relative to this file readme.
......
...@@ -4,17 +4,10 @@ ...@@ -4,17 +4,10 @@
## Credits ## Credits
- Rit Gabrielle - Rit Gabrielle
- Vintache Jean - Vintache Jean
<<<<<<< HEAD
- Douteau Jean-Come - Douteau Jean-Come
- Fecherolle Cecile (2014) - Fecherolle Cecile (2014)
##Presentation
=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)
## Presentation ## Presentation
>>>>>>> c48dac707699113384445195f6949017212e8164
How to transform an etherpad document in opale document. How to transform an etherpad document in opale document.
Filepaths in this document are relative to this readme file. Filepaths in this document are relative to this readme file.
......
...@@ -4,18 +4,11 @@ ...@@ -4,18 +4,11 @@
## Credits ## Credits
- Rit Gabrielle - Rit Gabrielle
- Vintache Jean - Vintache Jean
<<<<<<< HEAD
- Douteau Jean-Come - Douteau Jean-Come
- Fecherolle Cecile (2014) - Fecherolle Cecile (2014)
##Presentation
=======
- Douteau Jean-Côme
- Fecherolle Cécile (2014)
## Presentation ## Presentation
>>>>>>> c48dac707699113384445195f6949017212e8164
How to transform an etherpad document in optim document. How to transform an etherpad document in optim document.
Filepath in this document are relative to this file readme. Filepath in this document are relative to this file readme.
## Dependence ## 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