From e44b3296cf71fbbecc0ee7c753059c5e3d3240e6 Mon Sep 17 00:00:00 2001
From: "Pavel Turinsky (VM)" <mamweb-upgrade-vm@pokemon.ledoian.cz>
Date: Wed, 19 Aug 2020 09:28:15 +0200
Subject: [PATCH] Smazana zapomenuta konfliktova znacka

---
 seminar/admin.py | 1 -
 1 file changed, 1 deletion(-)

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