Skip to content

Commit

Permalink
fix: merge migrations to resolve conflict
Browse files Browse the repository at this point in the history
Refs: #147
  • Loading branch information
kunfang98927 committed Aug 16, 2024
1 parent 7105e67 commit 9209599
Showing 1 changed file with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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 = []

0 comments on commit 9209599

Please sign in to comment.