From 56e6049665032b16b4d318df68d38a9aebad24af Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Laptop.fritz.box>
Date: Mon, 13 Jul 2020 15:34:17 +0200
Subject: [PATCH] Remove merge markers....
---
web/app/templates/services/corpus_analysis.html.j2 | 3 ---
1 file changed, 3 deletions(-)
diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2
index 7e903999..87e67bc9 100644
--- a/web/app/templates/services/corpus_analysis.html.j2
+++ b/web/app/templates/services/corpus_analysis.html.j2
@@ -37,11 +37,8 @@
<ul class="pagination"></ul>
</div>
<div class="card-action right-align">
-<<<<<<< HEAD
-=======
<a class="waves-effect waves-light btn" href="{{ url_for('results.result_import') }}">Import Results<i class="material-icons right">file_upload</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('results.results_overview') }}">Show Imported Results<i class="material-icons right">folder</i></a>
->>>>>>> cdd421e48a28fc8353db4d61fb3c88ef8ff3b2a9
<a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_corpus') }}">New corpus<i class="material-icons right">add</i></a>
</div>
</div>
--
GitLab