Smazana zapomenuta konfliktova znacka

4 years ago · e44b3296cf
1 changed files with 0 additions and 1 deletions
--- 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