Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed left behind merge conflict

  • Loading branch information...
commit b4f8d92f22bcb7fcf63840a2f0e9067c58b9d1e4 1 parent 85a6efd
@leetrout leetrout authored
Showing with 0 additions and 4 deletions.
  1. +0 −4 zebra/views.py
View
4 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('.'))
Please sign in to comment.
Something went wrong with that request. Please try again.