aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Centeno2021-11-18 19:33:52 +0000
committerArthur Centeno2021-11-18 19:33:52 +0000
commita0b4fda475041c4f6d6a2fa35db1a93e90768c39 (patch)
treea04a284446eb8e02144e3746b5533a976e28966c
parentd0daa3727e203cfc36da227eb1e800d585bca14a (diff)
downloadgenenetwork2-a0b4fda475041c4f6d6a2fa35db1a93e90768c39.tar.gz
update base by AC
-rw-r--r--wqflask/wqflask/templates/base.html4
1 files changed, 0 insertions, 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>