From a0b4fda475041c4f6d6a2fa35db1a93e90768c39 Mon Sep 17 00:00:00 2001
From: Arthur Centeno
Date: Thu, 18 Nov 2021 19:33:52 +0000
Subject: update base by AC

---
 wqflask/wqflask/templates/base.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index e037246a..c17409d0 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -93,11 +93,7 @@
                                   <li><a href="https://systems-genetics.org/">Systems Genetics PheWAS</a></li>
                                   <li><a href="http://ucscbrowser.genenetwork.org/">Genome Browser</a></li>
                                   <li><a href="http://power.genenetwork.org">BXD Power Calculator</a></li>
-<<<<<<< HEAD
-                                  <li><a href="http://notebook.genenetwork.org/">Jupyter Notebook Launcher</a></li>
-=======
                                   <li><a href="{{url_for('jupyter_notebooks.launcher')}}">Jupyter Notebooks</a></li>
->>>>>>> dea1afa01025026a0754de60615b974a5cb3fd24
                                   <li><a href="http://datafiles.genenetwork.org">Interplanetary File System</a></li>
                                 </ul>
                         </li>
-- 
cgit v1.2.3