fix migration conflict

FFIB 2 年之前
父节点
当前提交
15861b0971
共有 1 个文件被更改,包括 15 次插入0 次删除
  1. 15 0
      member/migrations/0048_merge_20221027_2056.py

+ 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
+    ]