Remove merge text accidentally left in, for #889

django-helpdesk · Oct 15, 2020 · c0f1370 · c0f1370
1 parent 46b7f78
commit c0f1370
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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">