fix conflict
Showing
hdoc_to_lexique/README.md
0 → 100644
File moved
File moved
File moved
hdoc_to_lexique/run.bat
0 → 100644
hdoc_to_lexique/run.sh
0 → 100644
lexique_to_hdoc/README.md
0 → 100644
lexique_to_hdoc/coucou.txt
0 → 100644
File moved
File moved
File moved
lexique_to_hdoc/mimetype
0 → 100644
lexique_to_hdoc/mimetype~
0 → 100644
lexique_to_hdoc/rng/hdoc.rng
0 → 100644
This diff is collapsed.
lexique_to_hdoc/run.bat
0 → 100644
lexique_to_hdoc/run.sh
0 → 100755
This diff is collapsed.
This diff is collapsed.
lexique_to_opale/README.md
0 → 100644
File moved
File moved
File moved
lexique_to_opale/run.bat~
0 → 100644
lexique_to_opale/run.sh
0 → 100755
lexique_to_optim/README.md
0 → 100644