- From: Mercurial notifier <cvsmail@w3.org>
- Date: Tue, 10 Jul 2012 15:27:05 +0000
- To: public-dap-commits@w3.org
changeset: 138:e2e822387cdb
tag: tip
user: Robin Berjon <robin@berjon.com>
date: Tue Jul 10 11:27:00 2012 -0400
files: wi-addendum-local-services/Overview.html
description:
remove conflict marks from moronic hg
diff -r 56b3039c5f88 -r e2e822387cdb 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>
Received on Tuesday, 10 July 2012 15:27:10 UTC