diff --git a/seminar/admin.py b/seminar/admin.py
index 70f06966..edfbb595 100644
--- a/seminar/admin.py
+++ b/seminar/admin.py
@@ -162,4 +162,3 @@ class TextNodeAdmin(PolymorphicChildModelAdmin):
 
 admin.site.register(m.Nastaveni)
 admin.site.register(m.Novinky)
->>>>>>> origin/data_migrations