From 9209599b029c1d4d905d177258c1d04ed695ef55 Mon Sep 17 00:00:00 2001 From: Kun Fang Date: Fri, 16 Aug 2024 16:12:37 -0400 Subject: [PATCH] fix: merge migrations to resolve conflict Refs: #147 --- .../migrations/0004_merge_20240816_2008.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 web-app/django/VIM/apps/instruments/migrations/0004_merge_20240816_2008.py diff --git a/web-app/django/VIM/apps/instruments/migrations/0004_merge_20240816_2008.py b/web-app/django/VIM/apps/instruments/migrations/0004_merge_20240816_2008.py new file mode 100644 index 0000000..30589f8 --- /dev/null +++ b/web-app/django/VIM/apps/instruments/migrations/0004_merge_20240816_2008.py @@ -0,0 +1,12 @@ +# Generated by Django 4.2.5 on 2024-08-16 20:08 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("instruments", "0003_alter_avresource_instrument_and_more"), + ("instruments", "0003_alter_instrumentname_name"), + ] + + operations = []