Mercurial > hg > dap / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
remove conflict marks from moronic hg
authorRobin Berjon <robin@berjon.com>
Tue, 10 Jul 2012 11:27:00 -0400
changeset 138 e2e822387cdb
parent 137 56b3039c5f88
child 139 3422c398e3a4
remove conflict marks from moronic hg
wi-addendum-local-services/Overview.html 
--- a/wi-addendum-local-services/Overview.html	Tue Jul 10 11:21:03 2012 -0400
+++ b/wi-addendum-local-services/Overview.html	Tue Jul 10 11:27:00 2012 -0400
@@ -1,4 +1,3 @@
-<<<<<<< mine
 <!DOCTYPE html>
 <html>
   <head>
@@ -577,7 +576,7 @@
         </p>
     </section>
   </body>
-</html>=======
+</html>=======
 <!DOCTYPE html>
 <html>
   <head>
@@ -1156,4 +1155,4 @@
         </p>
     </section>
   </body>
-</html>>>>>>>> theirs
+</html>
dap

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org