conflict ?

ZiedHf · Nov 17, 2017 · 9194c9d · 9194c9d
2 parents d360736 + 7da364e
commit 9194c9d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/body.html b/body.html
@@ -1,5 +1,6 @@
 this is the body
 
-
-this is the version of msster
+<<<<<<< HEAD
+this is the version of Dev
+>>>>>>> Dev