discovery-api/Overview.src.html
changeset 288 ec6f8e4f894e
parent 254 f29ec967fb3b
child 330 78129450e57a
     1.1 --- a/discovery-api/Overview.src.html	Wed Nov 28 09:11:41 2012 -0500
     1.2 +++ b/discovery-api/Overview.src.html	Wed Nov 28 09:16:24 2012 -0500
     1.3 @@ -34,8 +34,13 @@
     1.4      <script type="text/javascript"
     1.5            class='remove'>
     1.6  var respecConfig = {
     1.7 +<<<<<<< local
     1.8 +          specStatus:   "WD",
     1.9 +          publishDate:  "2012-10-04",
    1.10 +=======
    1.11            specStatus:   "ED",
    1.12            //publishDate:  "2012-10-04",
    1.13 +>>>>>>> other
    1.14            shortName:    "discovery-api",
    1.15            edDraftURI:   "http://dvcs.w3.org/hg/dap/raw-file/tip/discovery-api/Overview.html",
    1.16            previousMaturity: "FPWD",