From 67d07a43ea0d2b5b25e8fdb221ecb793143b8344 Mon Sep 17 00:00:00 2001 From: Khavin Shankar Date: Thu, 8 Jun 2023 10:29:58 +0530 Subject: [PATCH] merged conflicting migrations --- care/facility/migrations/0360_merge_20230608_1025.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 care/facility/migrations/0360_merge_20230608_1025.py diff --git a/care/facility/migrations/0360_merge_20230608_1025.py b/care/facility/migrations/0360_merge_20230608_1025.py new file mode 100644 index 0000000000..9ba846dd44 --- /dev/null +++ b/care/facility/migrations/0360_merge_20230608_1025.py @@ -0,0 +1,12 @@ +# Generated by Django 2.2.11 on 2023-06-08 04:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("facility", "0359_auto_20230529_1907"), + ("facility", "0353_auto_20230511_1007"), + ] + + operations = []