Resolve conflict

tutorials/cell-editor.html

@@ -384,19 +384,10 @@ <h4 id="creating-select-input-and-attaching-it-to-dom">Creating <code>&lt;select
 }</code></pre>
     <p>Task two: <strong>DONE</strong></p>
     <h4 id="populating-select-with-options">Populating <code>&lt;select&gt;</code> with options</h4>
-<<<<<<< HEAD
-    <p>In the previous step we implemented a function that crates <code>&lt;select&gt;</code> input and attaches it to DOM.
-      You've probably noticed
-      that we haven't written any code that would create <code>&lt;option&gt;</code> elements, therefore if we would
-      display the list, it would be
-      empty.</p>
-    <p>We want to be able to define an option list like so:</p>
-=======
     <p>In the previous step we implemented a function that creates the <code>&lt;select&gt;</code> input and attaches it to the DOM.
       You probably noticed that we haven&#39;t written any code that would create the <code>&lt;option&gt;</code> elements, therefore if we
       displayed the list, it would be empty.</p>
     <p>We want to be able to define an option list like this:</p>
->>>>>>> c73a08268af5d4cd9aeaeb4fc8697e2701fe1d00
     <pre><code class="lang-js">var hot = new Handsontable(document.getElementById('container'), {
   data: someData,
   columns: [