Resolving merge conflict with master

1 files changed, 2 insertions, 0 deletions

diff --git a/manage.py b/manage.py
index ca7a5142..37cca124 100755
--- a/manage.py
+++ b/manage.py
@@ -5,6 +5,8 @@ import sys
 
 # Separate definition to ease calling this in other scripts.
 def main():
+    """Entry point for Django management script."""
+
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_site.settings')
     try:
         from django.core.management import execute_from_command_line