fixed left behind merge conflict

bigmlcom · Sep 22, 2011 · b4f8d92 · b4f8d92
1 parent 85a6efd
commit b4f8d92
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/zebra/views.py b/zebra/views.py
@@ -5,13 +5,9 @@
 from zebra.conf import options
 from zebra.signals import *
 
-<<<<<<< HEAD
 
-=======
->>>>>>> master
 stripe.api_key = options.STRIPE_SECRET
 
-
 def _try_to_get_customer_from_customer_id(stripe_customer_id):
     if options.ZEBRA_CUSTOMER_MODEL:
         m = get_model(*options.ZEBRA_CUSTOMER_MODEL.split('.'))