holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove merge text accidentally left in, for #889

Browse Source
This commit is contained in:
Garret Wassermann 2020-10-15 14:35:33 -04:00
parent 46b7f78968
commit c0f1370974
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helpdesk/templates/helpdesk/include/tickets.html
View File

@ -1,6 +1,5 @@
{% load i18n humanize %} {% load i18n humanize %}
<<<<<<< HEAD
<!-- DataTables Example --> <!-- DataTables Example -->
<div class="card mb-3"> <div class="card mb-3">
<div class="card-header"> <div class="card-header">