- From: Vincent Hardy via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 22 Nov 2011 17:19:44 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-regions
In directory hutz:/tmp/cvs-serv13279
Modified Files:
Overview.html Overview.src.html
Log Message:
Fixed merge error
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-regions/Overview.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Overview.html 22 Nov 2011 17:09:21 -0000 1.29
+++ Overview.html 22 Nov 2011 17:19:42 -0000 1.30
@@ -692,7 +692,7 @@
region and associates it with a named flow.
<div class=issue-marker><a
- href="http://wiki.csswg.org/spec/css3-regions?&#issue-12should-we-allow-multi-column-elements-to-be-regions">Issue-12</a></div>
+ href="http://wiki.csswg.org/spec/css3-regions#issue-12should-we-allow-multi-column-elements-to-be-regions">Issue-12</a></div>
<table class=propdef summary="flow-from property definition">
<tbody>
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-regions/Overview.src.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Overview.src.html 22 Nov 2011 17:09:21 -0000 1.32
+++ Overview.src.html 22 Nov 2011 17:19:42 -0000 1.33
@@ -507,7 +507,7 @@
<h3 id="the-flow-from-property">The 'flow-from' property</h3>
<p>The 'flow-from' property makes an element a region and associates it with a named flow.</p>
- <div class="issue-marker"><a href="http://wiki.csswg.org/spec/css3-regions?&#issue-12should-we-allow-multi-column-elements-to-be-regions">Issue-12</a></div>
+ <div class="issue-marker"><a href="http://wiki.csswg.org/spec/css3-regions#issue-12should-we-allow-multi-column-elements-to-be-regions">Issue-12</a></div>
<table class="propdef" summary="flow-from property definition">
<tr>
Received on Tuesday, 22 November 2011 17:19:50 UTC