Merge branch 'master', remote-tracking branch 'origin' into aquarium

[astakos] / astakos / manage.py

diff --git a/astakos/manage.py b/astakos/manage.py
deleted file mode 100755 (executable)
index da960ae..0000000
--- a/astakos/manage.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-def main():
-    execute_manager(settings)
-
-if __name__ == "__main__":
-    main()