From 5b469bb6ff179607a51c6ce637ab3ee921d594b6 Mon Sep 17 00:00:00 2001
From: Neal Nelson <neal@makalumedia.com>
Date: Thu, 10 Feb 2011 11:26:48 +0100
Subject: [PATCH] Fix conflicts in index.html

---
 docs/index.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index e06f7e9..48fbbb6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1027,15 +1027,6 @@ perl -ne 'BEGIN{print "Month,Nominal,Real\n"} chomp; ($m,$cpi,$low,$close,$high)
         </tr>
 
         <tr>
-<<<<<<< HEAD
-          <td><strong>noZoomFlagChange</strong></td>
-          <td><code></code></td>
-          <td><code></code></td>
-          <td>
-            When this flag is passed along with either the <code>dateWindow</code> or <code>valueRange</code> options, the zoom flags are not changed to reflect a zoomed state.
-            This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the <code>isZoomed</code> method to determine this.
-            <div class="tests">Tests: <a href="tests/no-zoom-change.html">no-zoom-change</a></div>
-=======
           <td><strong>logscale</strong></td>
           <td><code>boolean</code></td>
           <td><code>false</code></td>
@@ -1048,10 +1039,18 @@ perl -ne 'BEGIN{print "Month,Nominal,Real\n"} chomp; ($m,$cpi,$low,$close,$high)
 
             <div class="tests">Tests: <a href="tests/logscale.html">logscale</a>,
             <a href="tests/stock.html"> stock</div>
->>>>>>> a6a505d1759f087a1e29ad84fc8510aa4cbc4f6e
           </td>
         </tr>
 
+        <tr>
+          <td><strong>noZoomFlagChange</strong></td>
+          <td><code></code></td>
+          <td><code></code></td>
+          <td>
+            When this flag is passed along with either the <code>dateWindow</code> or <code>valueRange</code> options, the zoom flags are not changed to reflect a zoomed state.
+            This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the <code>isZoomed</code> method to determine this.
+            <div class="tests">Tests: <a href="tests/no-zoom-change.html">no-zoom-change</a></div>
+        </tr>
       </tbody>
     </table>
 
-- 
2.7.4