--- a/discovery-api/Overview.src.html	Thu Oct 25 19:49:39 2012 +0200
+++ b/discovery-api/Overview.src.html	Thu Jan 17 15:07:19 2013 +0100
@@ -34,13 +34,8 @@
     <script type="text/javascript"
           class='remove'>
 var respecConfig = {
-<<<<<<< local
-          specStatus:   "WD",
-          publishDate:  "2012-10-04",
-=======
           specStatus:   "ED",
           //publishDate:  "2012-10-04",
->>>>>>> other
           shortName:    "discovery-api",
           edDraftURI:   "http://dvcs.w3.org/hg/dap/raw-file/tip/discovery-api/Overview.html",
           previousMaturity: "FPWD",