mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Smazana zapomenuta konfliktova znacka

Browse source
This commit is contained in:
Pavel Turinsky (VM) 2020-08-19 09:28:15 +02:00
parent 3f5c5ee217
commit e44b3296cf
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
seminar/admin.py
View file

@ -162,4 +162,3 @@ class TextNodeAdmin(PolymorphicChildModelAdmin):
admin.site.register(m.Nastaveni) admin.site.register(m.Nastaveni)
admin.site.register(m.Novinky) admin.site.register(m.Novinky)
>>>>>>> origin/data_migrations