Merge branch 'branch3'

pcakhilnadh · pcakhilnadh · commit 40e6bb6f3108 · 2018-05-03T20:45:12.000+05:30
diff --git a/index.html b/index.html
@@ -1,7 +1,13 @@
 <html>
 Hello World !
+index page created  Conflit Created
+First Branch on Developed 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
+
+This is how I combined merges of both side Yah Finally Fully merged 
 </html>
