README

JFGEER83 · Sep 5, 2018 · 0b89415 · 0b89415
1 parent 924b433
commit 0b89415
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -31,19 +31,15 @@ https://github.com/becodeorg/Johnson2/tree/master/projets/COGIPapp
 
 * DB
 * Invoices (CRUD, page, detailpage)
-<<<<<<< HEAD
-*
-=======
-* Systeme d'inscription propre
-* Login- Déconnexion
-* Acceuil personalisé
->>>>>>> 7208dd5b37a830cd9496cdaaa95f213ef1237229
+* Registration System
+* Login- disconnection
+* Home personalized
 
 ## What [Marie Louise Ogdoc](https://github.com/OGlou7) did :
 
 * Workbench
 * Contacts (CRUD, page, detailpage)
-*
+* 000webhost
 
 
 ## What [Jean-François Geerinckx](https://github.com/JFGEER83) did :