Revert "up"

This reverts commit c0e772e7. Conflicts: README.md

Revert "up"
This reverts commit c0e772e7. Conflicts: README.md
81bb04b9 · jfuser · 6209e057 · 81bb04b9
Commit 81bb04b9 authored Apr 02, 2014 by jfuser
--- a/README.md
+++ b/README.md
@@ -37,3 +37,7 @@ Accés direct
 5. [Premiers pas](https://gitlab.paca.inra.fr/biosp/howtogitlab/wikis/debut)
 6. [Commandes de base](https://gitlab.paca.inra.fr/biosp/howtogitlab/wikis/Commandes)

+<<<<<<< HEAD
+=======
+
+>>>>>>> parent of c0e772e... up