From c0f1370974f18354faa2cb94e1ee6d26974fab59 Mon Sep 17 00:00:00 2001
From: Garret Wassermann <gwasser@gmail.com>
Date: Thu, 15 Oct 2020 14:35:33 -0400
Subject: [PATCH] Remove merge text accidentally left in, for #889

---
 helpdesk/templates/helpdesk/include/tickets.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/helpdesk/templates/helpdesk/include/tickets.html b/helpdesk/templates/helpdesk/include/tickets.html
index 808f47b6..6c0aeb1b 100644
--- 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">