Put back newlines in Conflict responses.

[pithos] / setup.py

diff --git a/setup.py b/setup.py
index a61456e..d90b519 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -47,8 +47,6 @@ VERSION = get_version().replace(' ', '')
 
 INSTALL_REQUIRES = [
     'Django==1.2.3',
-    'South==0.7',
-    'httplib2==0.6.0',
     'SQLAlchemy==0.6.3',
     'MySQL-python==1.2.2',
     'psycopg2==2.2.1'
@@ -183,4 +181,3 @@ setup(
         'pithos/tools/pithos-test'
     ]
 )
-