From 542bd76626a3905e8d8223a64d1f0c6bb6b5860c Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 2 Dec 2020 13:20:30 +0100
Subject: Fix merge

---
 ishtar_common/admin.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index a321a6690..be6302562 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1099,11 +1099,6 @@ class AreaAdmin(CreateDepartmentActionAdmin):
         model, {'towns': 'town'}
     )
 
-
-@admin.register(models.DocumentTag, site=admin_site)
-class DocumentTag(MergeActionAdmin, GeneralTypeAdmin):
-    pass
-
 admin_site.register(models.Area, AreaAdmin)
 
 
-- 
cgit v1.2.3