From 1d9ec2b89b4dc8d17c63439f50b5113747378a6c Mon Sep 17 00:00:00 2001 From: cp-Coder Date: Wed, 31 Aug 2022 15:56:07 +0530 Subject: [PATCH] Added migrations to merge conflicting migrations --- .../migrations/0313_merge_20220831_1553.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 care/facility/migrations/0313_merge_20220831_1553.py diff --git a/care/facility/migrations/0313_merge_20220831_1553.py b/care/facility/migrations/0313_merge_20220831_1553.py new file mode 100644 index 0000000000..5fa8360c30 --- /dev/null +++ b/care/facility/migrations/0313_merge_20220831_1553.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.11 on 2022-08-31 10:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('facility', '0312_patientconsultation_investigation'), + ('facility', '0311_auto_20220831_0900'), + ] + + operations = [ + ]