From 85aff509108fa524c7215545f9a3274d19248f8e Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Mon, 27 Jun 2022 16:14:37 +0200 Subject: [PATCH] Merge conflicted migrations --- teleforma/migrations/0019_merge_20220627_1418.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 teleforma/migrations/0019_merge_20220627_1418.py diff --git a/teleforma/migrations/0019_merge_20220627_1418.py b/teleforma/migrations/0019_merge_20220627_1418.py new file mode 100644 index 00000000..84cb754d --- /dev/null +++ b/teleforma/migrations/0019_merge_20220627_1418.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.3 on 2022-06-27 14:18 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teleforma', '0018_conference_notified'), + ('teleforma', '0018_notification_viewed'), + ] + + operations = [ + ] -- 2.39.5