Skip to content

Commit 4a4c045

Browse files
authored
Merge pull request #587 from xchem/m2ms-1392-poses-backend
fix: merge conflicting migrations
2 parents b6e77e9 + f54694b commit 4a4c045

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Generated by Django 3.2.25 on 2024-05-16 10:03
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('viewer', '0054_auto_20240509_0838'),
10+
('viewer', '0054_merge_20240507_1558'),
11+
]
12+
13+
operations = [
14+
]

0 commit comments

Comments
 (0)