Resolve merge conflicts

2019-09-15 13:02:35 +02:00 · 2019-09-15 13:02:35 +02:00 · 02a391d308
commit 02a391d308
parent ac3a8d2199 0c5628759f
2 changed files with 6 additions and 5 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,4 @@
-# Evennia dependencies, for Linux/Mac platforms
+# Evennia dependencies

 # general
 django >= 2.2.5, < 2.3
@ -13,3 +13,6 @@ model_mommy
 # testing
 mock >= 1.0.1
 anything
+
+# windows-specific
+pypiwin32;platform_system=="Windows"