diff options
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/templates/base.html | 4 |
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> |