--- 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",
--- a/network-api/Overview.html Wed Nov 28 09:11:41 2012 -0500
+++ b/network-api/Overview.html Wed Nov 28 09:16:24 2012 -0500
@@ -9,7 +9,7 @@
specStatus: "ED",
shortName: "netinfo-api",
- publishDate: "2012-11-23",
+// publishDate: "2012-11-29",
previousPublishDate: "2011-06-07",
previousMaturity: "WD",
edDraftURI: "http://dvcs.w3.org/hg/dap/raw-file/tip/network-api/Overview.html",
@@ -364,4 +364,4 @@
</p>
</section>
</body>
-</html>
\ No newline at end of file
+</html>