fix migration conflict
1 changed files with 15 additions and 0 deletions
+ 15
- 0
member/migrations/0048_merge_20221027_2056.py
@@ -0,0 +1,15 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 3.2.8 on 2022-10-27 12:56 |
|
| 3 |
+ |
|
| 4 |
+from django.db import migrations |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('member', '0046_alter_memberactivitycontributionwelfareunlockinginfo_unique_together'),
|
|
| 11 |
+ ('member', '0047_memberactivitycontributionwelfareunlockinginfo_welfare_type'),
|
|
| 12 |
+ ] |
|
| 13 |
+ |
|
| 14 |
+ operations = [ |
|
| 15 |
+ ] |