resolve base.py conflict

This commit is contained in:
Tomislav R 2016-05-07 23:05:46 +02:00
commit fbbee2839c
6 changed files with 98 additions and 51 deletions

View file

@ -1,6 +1,5 @@
import stripe
from django.conf import settings
stripe.api_key = settings.STRIPE_API_PRIVATE_KEY
@ -122,3 +121,6 @@ class StripeUtils(object):
name=name,
currency=self.CURRENCY,
id=id)