remove conflict output

cfpb · Dec 12, 2012 · 64f2f03 · 64f2f03
1 parent 512b5a6
commit 64f2f03
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",