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

hixie: Fix conflicts...

From: poot <cvsmail@w3.org>
Date: Sun, 26 Jul 2009 12:36:26 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090726033627.2CD082BC00@toro.w3.mag.keio.ac.jp>
hixie: Fix conflicts...

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.2669&r2=1.2670&f=h

===================================================================
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:37:03 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:07 GMT