From 25f53c2f0c89a708bfa4554c4c58d96d015877d9 Mon Sep 17 00:00:00 2001 From: cp-Coder Date: Fri, 28 Oct 2022 15:34:42 +0530 Subject: [PATCH] fix(facility): added conflicting migrations --- .../migrations/0327_merge_20221028_1533.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 care/facility/migrations/0327_merge_20221028_1533.py diff --git a/care/facility/migrations/0327_merge_20221028_1533.py b/care/facility/migrations/0327_merge_20221028_1533.py new file mode 100644 index 0000000000..ec130591b6 --- /dev/null +++ b/care/facility/migrations/0327_merge_20221028_1533.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.11 on 2022-10-28 10:03 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('facility', '0326_auto_20221018_1526'), + ('facility', '0324_merge_20221009_1013'), + ] + + operations = [ + ]