mirror of
https://github.com/evennia/evennia.git
synced 2026-03-16 21:06:30 +01:00
Fix merge conflicts
This commit is contained in:
commit
b855f4fb20
1 changed files with 1 additions and 1 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# general
|
||||
attrs >= 19.2.0
|
||||
django >= 3.2, < 3.3
|
||||
twisted >= 20.3.0, < 22.0.0
|
||||
twisted >= 21.7.0, < 22.0.0
|
||||
pytz
|
||||
djangorestframework >= 3.10.3, < 3.12
|
||||
pyyaml
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue