Resolve merge conflicts

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"

setup.py

@@ -10,11 +10,9 @@ OS_WINDOWS = os.name == "nt"
 
 def get_requirements():
     """
-    To update the requirements for Evennia, edit the requirements.txt
-    file, or win_requirements.txt for Windows platforms.
+    To update the requirements for Evennia, edit the requirements.txt file.
     """
-    filename = 'win_requirements.txt' if OS_WINDOWS else 'requirements.txt'
-    with open(filename, 'r') as f:
+    with open('requirements.txt', 'r') as f:
         req_lines = f.readlines()
     reqs = []
     for line in req_lines: