From ac3934663202bc11db4f76c019b21f3851691038 Mon Sep 17 00:00:00 2001
From: Marcos Caceres <marcos.caceres@wacapps.net>
Date: Mon, 24 Sep 2012 15:27:21 +0100
Subject: [PATCH] Fixed merge conflict

---
 ResponsiveImages.html | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/ResponsiveImages.html b/ResponsiveImages.html
index 50aa73f0..3583b45e 100644
--- a/ResponsiveImages.html
+++ b/ResponsiveImages.html
@@ -230,32 +230,9 @@ <h1>Examples</h1>
     </section>
 <!-- examples -->
 
-<section id="use-cases" class="appendix informative">
-<<<<<<< HEAD
-      <section id="goals">
-    <h1>Goals</h1>
-    <p>The overarching goal is to  give  developers a way to provide user agents with sufficient information about each image, and applicable media, so that the user agent can select the most appropriate one for a dynamically changing browsing situations. This includes, but is not limited to, different screen pixel width/height, pixel densities, environmental lighting conditions, and potentially even situations where the network bandwith changes dymamically. By providing a graded set of image sources, UA discretion could similarly apply to situations where the network bandwith changes dymamically. Based on user settings and network latency calculated by the user agent, the UA may have the option of selecting lower density image sources.</p>
-    <p>In addition, this proposal is being worked on with the following goals in mind:</p>
-    <ul>
-          <li>Respond to different screen pixel width/height.</li>
-          <li>Respond to different screen pixel densities.</li>
-          <li>Allows developers to provide user agents with sufficient information about each image source, allowing the user agent to select the most appropriate one for dynamically changing browsing situations. This includes but is not limited to: differing screen/window widths and heights, pixel densities, environmental lighting conditions, and any combination of contextual cues provided by media queries.</li>
-          <li>Provides a graded set of image sources, allowing UA discretion to potentially be applied to situations where network bandwith is limited or variable. Based on user settings and network latency calculated by the user agent, the UA may have the option of selecting lower density image sources to conserve bandwidth.</li>
-          <li>Will degrade gracefully on older user agents.</li>
-          <li>Can be polyfilled.</li>
-          <li>Retains, at a minimum, the same level of accessibility as current <code>img</code> element. The resolution of <a href="http://www.w3.org/html/wg/tracker/issues/30">ISSUE-30: Should HTML 5 include a longdesc attribute for images</a> will determine the method by which authors can provide semantically rich markup as accessible text. </li>
-          <li>Preserves separation of content markup and styling.</li>
-           <li>Provides a consistent and predictable pattern for delivering alternate media sources based on client context.</li>
-          <li>Provides a purely client-side solution which may include JavaScript, but doesn’t require it.</li>
-          <li>Supports succinct but understandable mark-up.</li>
-          <li>Don't repeat yourself: If the same image is used multiple times on a single page, it would be useful to define the resource selection in a single place in the document and have this affect all instances of the image</li>
-        </ul>
-  </section>
-      <h1>Use Cases </h1>
-=======
-   
+<section id="use-cases" class="appendix informative">   
   <h1>Use Cases </h1>
->>>>>>> Cosmetic changes and removed some attribute defs that are not inherited from HTMLImageInterface
+Cosmetic changes and removed some attribute defs that are not inherited from HTMLImageInterface
       <p>There are many use cases that are supported as listed below. There are two primary use cases:</p>
       <ol>
     <li>The need for different image sources at different viewport sizes in responsive web designs.</li>