resoled merge conflicts

1 files changed, 27 insertions, 0 deletions

diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1d3f939
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,27 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='django-debug-toolbar',
+    version=__import__('debug_toolbar').__version__,
+    description='A configurable set of panels that display various debug information about the current request/response.',
+    long_description=open('README.rst').read(),
+    # Get more strings from http://www.python.org/pypi?:action=list_classifiers
+    author='Rob Hudson',
+    author_email='rob@cogit8.org',
+    url='http://rob.cogit8.org/blog/2008/Sep/19/introducing-django-debug-toolbar/',
+    #download_url='http://github.com/robhudson/django-debug-toolbar/tree/master',
+    license='BSD',
+    packages=find_packages(exclude=['ez_setup']),
+    include_package_data=True,
+    zip_safe=False, # because we're including media that Django needs
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+)