Put back newlines in Conflict responses.

[pithos] / pithos / manage.py

diff --git a/pithos/manage.py b/pithos/manage.py
index b8c4be8..da960ae 100755 (executable)
--- a/pithos/manage.py
+++ b/pithos/manage.py
@@ -1,11 +1,14 @@
-#!/usr/bin/env python\r
-from django.core.management import execute_manager\r
-try:\r
-    import settings # Assumed to be in the same directory.\r
-except ImportError:\r
-    import sys\r
-    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__)\r
-    sys.exit(1)\r
-\r
-if __name__ == "__main__":\r
-    execute_manager(settings)\r
+#!/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()