merge

erikvw · May 21, 2015 · 3c8d8c6 · 3c8d8c6
1 parent a9fa74c
commit 3c8d8c6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -22,12 +22,9 @@
     long_description=README,
     zip_safe=False,
     keywords='django fields git',
-<<<<<<< HEAD
-=======
     install_requires=[
         'GitPython>=1.0',
     ],
->>>>>>> release/0.1.6
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',