removed duplicate info from merge conflict

a "git diff --word-diff" showed no differences between the sections in
the right scenario, so i've removed one of the copies.

diff --git a/2017/js-labels/index.html b/2017/js-labels/index.html
index 70f065bce6809ef944635b66b89d3623be47888f..474b1ed0e30305c6ca75c91a05c4661e898f80c8 100755 (executable)
--- a/2017/js-labels/index.html
+++ b/2017/js-labels/index.html
@@ -6,7 +6,6 @@
 <!--#include virtual="/2017/includes/sidebar.html"-->
 
 
-<<<<<<< HEAD
 <table class="table" id="jslicense-labels1">
 
   <tr>
@@ -47,46 +46,5 @@
   </tr>
 </table>
 
-=======
-       <table class="table" id="jslicense-labels1">
-
-         <tr>
-               <td><a href="/2017/assets/js/lodash.min.js">lodash.min.js</a></td>
-               <td><a href="https://lodash.com/license">Expat</a></td>
-               <td><a href="/2017/assets/js/lodash.js">load.js</a></td>
-         </tr>
-
-         
-         <tr>
-           <td><a href="/2017/assets/js/engine.io.bundle.min.js">engine.io.bundle.min.js</a></td>
-           <td><a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a></td>
-           <td><a href="/2017/assets/js/engine.io.bundle.js">engine.io.bundle.js</a></td>
-         </tr>
-         
-          <tr>
-           <td><a href="/2017/assets/js/kiwi.min.js">kiwi.min.js</a></td>
-           <td><a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a></td>
-           <td><a href="/2017/assets/js/kiwi.js">kiwi.js</a></td>
-         </tr>
-
-         
-         <tr>
-               <td><a href="/2017/assets/js/jquery-1.11.3.min.js">jquery-1.11.3.min.js</a></td>
-               <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-               <td><a href="/2017/assets/js/jquery-1.11.3.js">jquery-1.11.3.js</a></td>
-         </tr>
-         <tr>
-               <td><a href="/2017/assets/js/bootstrap-3.3.5.min.js">bootstrap-3.3.5.min.js</a></td>
-               <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-               <td><a href="/2017/assets/js/bootstrap-3.3.5.js">bootstrap-3.3.5.js</a></td>
-         </tr>
-         <tr>
-               <td><a href="/2017/assets/js/piwik.js">piwik.js</a></td>
-               <td><a href="http://www.gnu.org/licenses/gpl.html">GNU General
-                       Public License version 3 or later</a></td>
-               <td><a href="/2017/assets/js/piwik.js">piwik.js</a></td>
-         </tr>
-       </table>
->>>>>>> master
 <!--#include virtual="/2017/includes/footer.html"-->
 <!--#include virtual="/2017/includes/close.html" -->