fix merge error
This commit is contained in:
parent
1d3c8afcd9
commit
f14b239043
1 changed files with 0 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue