discovery-api/Overview.src.html
changeset 288 ec6f8e4f894e
parent 254 f29ec967fb3b
child 330 78129450e57a
--- a/discovery-api/Overview.src.html	Wed Nov 28 09:11:41 2012 -0500
+++ b/discovery-api/Overview.src.html	Wed Nov 28 09:16:24 2012 -0500
@@ -34,8 +34,13 @@
     <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",