Fixed merge error

Author: vhardy

css3-regions/Overview.html

@@ -692,7 +692,7 @@ <h3 id=the-flow-from-property><span class=secno>4.2. </span>The &lsquo;<a
    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>

css3-regions/Overview.src.html

@@ -507,7 +507,7 @@ <h3 id="the-flow-into-property">The 'flow-into' property</h3>
     <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>