Remove merge text accidentally left in, for #889

2020-10-15 14:35:33 -04:00 · 2020-10-15 14:35:33 -04:00 · c0f1370974
commit c0f1370974
parent 46b7f78968
1 changed files with 0 additions and 1 deletions
--- a/helpdesk/templates/helpdesk/include/tickets.html
+++ b/helpdesk/templates/helpdesk/include/tickets.html
@ -1,6 +1,5 @@
 {% load i18n humanize %}

-<<<<<<< HEAD
 <!-- DataTables Example -->
 <div class="card mb-3">
    <div class="card-header">