Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Stephane Crozat
hdoc
Commits
d77a0812
Commit
d77a0812
authored
Jan 07, 2016
by
jcomedouteau
Browse files
resolve conflict readme
parent
297380da
Changes
3
Hide whitespace changes
Inline
Side-by-side
etherpad_to_lexique/README.md
View file @
d77a0812
...
...
@@ -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.
...
...
etherpad_to_opale/README.md
View file @
d77a0812
...
...
@@ -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.
...
...
etherpad_to_optim/README.md
View file @
d77a0812
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment