fix merge error

This commit is contained in:
Your Name 2023-01-12 17:19:19 -05:00 committed by Henri Dickson
parent 1d3c8afcd9
commit f14b239043

View file

@ -10,12 +10,8 @@ django-user-messages
django-slack
django-ninja
django-polymorphic
<<<<<<< HEAD
django-maintenance-mode
=======
django-debug-toolbar
django-tz-detect
>>>>>>> 1a1c053 (user may change mark date)
meilisearch
easy-thumbnails
lxml