Minor fixes, DB sync after rebase

uncloud_django_based/uncloud/uncloud_pay/migrations/0006_auto_20200415_1003.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('uncloud_pay', '0004_auto_20200409_1225'),
+        ('uncloud_pay', '0005_auto_20200413_0924'),
     ]
 
     operations = [

uncloud_django_based/uncloud/uncloud_pay/models.py

@@ -514,7 +514,6 @@ class Bill(models.Model):
         # A bill is final when its ending date is passed.
         return self.ending_date < timezone.now()
 
-<<<<<<< HEAD
     def activate_products(self):
         for order in self.order_set.all():
             # FIXME: using __something might not be a good idea.
@@ -523,6 +522,7 @@ class Bill(models.Model):
                     if product.status == UncloudStatus.AWAITING_PAYMENT:
                         product.status = UncloudStatus.PENDING
                         product.save()
+
     @property
     def billing_address(self):
         return self.order.billing_address