Merge pull request cfpb#55 from dlapiduz/master

Remove git conflict output from setup.py
virtix · Jan 3, 2013 · 9be6343 · 9be6343
2 parents 512b5a6 + 64f2f03
commit 9be6343
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -11,7 +11,6 @@
     cmdclass = {}
 
 setup(name="django-nudge",
-<<<<<<< HEAD
       version="0.8",
       description="Use Nudge to (gently) push content between Django servers",
       author="Joshua Ruihley, Ross Karchner",