sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-03 20:02:47 +00:00
Code Issues Projects Releases Wiki Activity

Remove merge markers....

Browse Source
This commit is contained in:
Patrick Jentsch
2020-07-13 15:34:17 +02:00
parent ac3310fea5
commit 56e6049665
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/templates/services/corpus_analysis.html.j2
View File

@@ -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>