Merge branch 'branch2'

pcakhilnadh · pcakhilnadh · commit 3b78ccd7d34c · 2018-05-03T20:41:33.000+05:30
diff --git a/index.html b/index.html
@@ -1,6 +1,7 @@
 <html>
 Hello World !
-index page created  Conflit Created
-First Master
-Development on master  
+index page created "--Conflit Was here"
+First "--Conflit Was here"
+Development on "--Conflit Was here"
+This is After Merging Simple Conflicts between Branch2 and Master . And Merging to Master
 </html>
