Commits

Guillaume Piot committed 49139ba

Requires django1.4.1

Comments (0)

Files changed (1)

     'Topic :: Software Development',
 ]
 
-<<<<<<< HEAD
-=======
 install_requires = [
-    'django>=1.4.1',
+    'django==1.4.1',
 ]
 
 # taken from django-registration
         for f in filenames:
             data_files.append(os.path.join(prefix, f))
 
-print packages, data_files
 
->>>>>>> origin/master
 setup(
     name="cotidia-admin-tools",
     description="Django application to add features to the original admin",
     author_email="guillaume@cotidia.com",
     url="https://bitbucket.org/guillaumepiot/cotidia-admin-tools",
     download_url="https://bitbucket.org/guillaumepiot/cotidia-admin-tools/downloads/cotidia-admin-tools-0.4.1.tar.gz",
-<<<<<<< HEAD
-    packages=find_packages(exclude=["tests"]),
-=======
     package_dir={'admin_tools': 'admin_tools'},
     packages=packages,
     package_data={'admin_tools': data_files},
->>>>>>> origin/master
     include_package_data=True,
     install_requires=install_requires,
     classifiers=CLASSIFIERS,