Fixing the HTML merge errors

index.html

@@ -570,13 +570,13 @@
 </p>
   <h1 class="p-name no-ref" id=title>Use Cases and Requirements for Element Queries</h1>
   <h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20141120>20 November 2014</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20141124>24 November 2014</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://responsiveimagescg.github.io/eq-usecases/>http://responsiveimagescg.github.io/eq-usecases/</a><dt class=editor>Editors:<dd class=editor><div class="p-author h-card vcard"><a class="p-name fn u-url url" href=http://responsiveimages.org>Mat Marquis</a> (<span class="p-org org">RICG</span>)</div><dd class=editor><div class="p-author h-card vcard"><a class="p-name fn u-url url" href=http://filamentgroup.com/>Scott Jehl</a> (<span class="p-org org">Filament Group</span>)</div><dt>Version History:<dd><span><a href=https://github.com/ResponsiveImagesCG/eq-usecases/commits/gh-pages>Commit History</a></span><dt>Participate:<dd><span><a href=irc://irc.w3.org:6665/#respimg>IRC: #respimg on W3C’s IRC</a></span><dd><span><a href=https://github.com/ResponsiveImagesCG/eq-usecases>GitHub</a></span></dl></div>
   <div data-fill-with=warning></div>
   <p class=copyright data-fill-with=copyright><a href=http://creativecommons.org/publicdomain/zero/1.0/ rel=license><img alt=CC0 src=https://i.creativecommons.org/p/zero/1.0/80x15.png></a>
 To the extent possible under law, the editors have waived all copyright
 and related or neighboring rights to this work.
-In addition, as of 20 November 2014,
+In addition, as of 24 November 2014,
 the editors have made this specification available under the
 <a href=http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0 rel=license>Open Web Foundation Agreement Version 1.0</a>,
 which is available at http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
@@ -613,11 +613,7 @@ <h2 class="heading settled" data-level=1 id=intro><span class=secno>1. </span><s
 
 <p>For the purposes of this document, an <dfn data-dfn-type=dfn data-noexport="" id=dfn-element-query>element query<a class=self-link href=#dfn-element-query></a></dfn> refers not to a specific syntax or proposed method of addressing the use cases that follow, but a method of controlling styling based on the size of a containing element.</p>
 
-<<<<<<< HEAD
 <p>This document aims to present some of the use cases that an “element query” syntax would solve, in allowing authors to define layouts within an individual module on the basis of the size of the module itself rather than the viewport. The goal is to demonstrate a need for a method of allowing content to respond to its container’s dimensions (as opposed to the overall viewport size), to facilitate the construction of layouts comprised of many modular, independent HTML components with a minimum of duplicated CSS and overrides specific to the modules’ parent containers.</p>
-=======
-<p>This document aims to present some of the use cases that an element query soution would address. The goal is to demonstrate a need for a method of allowing content respond to its container’s dimensions (as opposed to the overall viewport size), to facilitate the construction of layouts comprised of many modular, independent HTML components with a minimum of duplicated CSS and overrides specific to the modules’ parent containers.</p>
->>>>>>> Removed proposal-esque text.
 
 <p>In formulating the requirements, this document tries to be neutral—it is not predicated on any solution. The document only tries to describe the use cases and what the RICG understands, from practice, would be needed to address the use cases in the form of requirements. The RICG expects that a technical specification can be created to formally address each or all of the requirements (i.e., the <dfn data-dfn-type=dfn data-noexport="" id=dfn-solution>solution<a class=self-link href=#dfn-solution></a></dfn>).</p>
 
@@ -662,11 +658,7 @@ <h2 class="heading settled" data-level=3 id=usecases><span class=secno>3. </span
 	<figcaption>A stylesheet heatmap showing added redundancy and rewriting of existing styles required to accommodate the layout variation in <a href=#fig-4>fig. 4</a> </figcaption>
 </figure>
 
-<<<<<<< HEAD
-<p>What this document proposes is the addition of an “element query” syntax, allowing breakpoints to be applied based on the width of a parent container. For the purposes of this example, we would then be able to scope out modules’ layouts to the size of the module itself.</p>
-=======
 <h2 class="heading settled" data-level=4 id=requirements><span class=secno>4. </span><span class=content>Requirements</span><a class=self-link href=#requirements></a></h2>
->>>>>>> Removed proposal-esque text.
 
 <p>The use cases give rise to the following <dfn data-dfn-type=dfn data-noexport="" id=dfn-requirements>requirements<a class=self-link href=#dfn-requirements></a></dfn>:</p>
 
@@ -722,4 +714,4 @@ <h2 class="no-ref no-num heading settled" id=conformance><span class=content>
 
 
 
-<h2 class="no-num heading settled" id=references><span class=content>References</span><a class=self-link href=#references></a></h2><h3 class="no-num heading settled" id=normative><span class=content>Normative References</span><a class=self-link href=#normative></a></h3><dl><dt id=biblio-rfc2119 title=rfc2119><a class=self-link href=#biblio-rfc2119></a>[rfc2119]<dd>S. Bradner. <a href=http://www.ietf.org/rfc/rfc2119.txt>Key words for use in RFCs to Indicate Requirement Levels</a>. March 1997. Best Current Practice. URL: <a href=http://www.ietf.org/rfc/rfc2119.txt>http://www.ietf.org/rfc/rfc2119.txt</a></dl><h2 class="no-num heading settled" id=index><span class=content>Index</span><a class=self-link href=#index></a></h2><ul class=indexlist><li>element query, <a href=#dfn-element-query title="section 1">1</a><li>requirements, <a href=#dfn-requirements title="section 4">4</a><li>solution, <a href=#dfn-solution title="section 1">1</a><li>use cases, <a href=#dfn-usecases title="section 3">3</a></ul>
+<h2 class="no-num heading settled" id=references><span class=content>References</span><a class=self-link href=#references></a></h2><h3 class="no-num heading settled" id=normative><span class=content>Normative References</span><a class=self-link href=#normative></a></h3><dl><dt id=biblio-rfc2119 title=rfc2119><a class=self-link href=#biblio-rfc2119></a>[rfc2119]<dd>S. Bradner. <a href=https://tools.ietf.org/html/rfc2119>Key words for use in RFCs to Indicate Requirement Levels</a>. March 1997. Best Current Practice. URL: <a href=https://tools.ietf.org/html/rfc2119>https://tools.ietf.org/html/rfc2119</a></dl><h2 class="no-num heading settled" id=index><span class=content>Index</span><a class=self-link href=#index></a></h2><ul class=indexlist><li>element query, <a href=#dfn-element-query title="section 1">1</a><li>requirements, <a href=#dfn-requirements title="section 4">4</a><li>solution, <a href=#dfn-solution title="section 1">1</a><li>use cases, <a href=#dfn-usecases title="section 3">3</a></ul>