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

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

Browse Source
This commit is contained in:
Patrick Jentsch
2020-07-13 15:33:58 +02:00
parent 6760061d53 cdd421e48a
commit ac3310fea5
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,11 @@
<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>