W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2009

html5/spec Overview.html,1.2669,1.2670

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 26 Jul 2009 03:36:06 +0000
To: public-html-commits@w3.org
Message-Id: <E1MUuWt-0004qp-44@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv18599

Modified Files:
	Overview.html 
Log Message:
Fix conflicts...

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2669
retrieving revision 1.2670
diff -u -d -r1.2669 -r1.2670
--- Overview.html	26 Jul 2009 03:32:19 -0000	1.2669
+++ Overview.html	26 Jul 2009 03:36:03 -0000	1.2670
@@ -197,11 +197,7 @@
    </dl><p>This specification is available in the following formats: 
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>.
-<<<<<<< Overview.html
-    This is $Revision$.
-=======
     This is $Revision$.
->>>>>>> 1.2668
    </p>
    <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &copy; 2009 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Sunday, 26 July 2009 03:36:17 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Sunday, 26 July 2009 03:36:17 GMT