Commit 2e7e5ff7 authored by janis.streib's avatar janis.streib 🦉
Browse files

FIXUP: merge conflict fuckup

parent 858875b7
Pipeline #180605 passed with stages
in 11 minutes and 29 seconds
......@@ -250,7 +250,6 @@
<font-awesome-icon :icon="['far', 'trash-alt']"></font-awesome-icon>
</b-button>
</span>
<<<<<<< HEAD
</div>
<b-tooltip :target="record_type+'_bulk'" triggers="hover"
variant="danger" placement="right">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment