Skip to content

Commit f263940

Browse files
committed
Fixing conflicting migration heads.
1 parent a49c378 commit f263940

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Merge migration: reconciles staging item/creature chain with feature crossreference chain.
2+
# Staging leaf: 0074_alter_creature_challenge_rating
3+
# Feature leaf: 0077_alter_crossreference_options
4+
from django.db import migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api_v2', '0074_alter_creature_challenge_rating'),
11+
('api_v2', '0077_alter_crossreference_options'),
12+
]
13+
14+
operations = [
15+
]

0 commit comments

Comments
 (0)