Skip to content

Commit 294be0b

Browse files
committed
Solve model migration conflicts when merge
1 parent f880414 commit 294be0b

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Generated by Django 5.1.14 on 2026-02-03 03:27
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("game_dev", "0010_merge_20260131_1118"),
10+
("game_dev", "0010_socialmedia"),
11+
]
12+
13+
operations = []

0 commit comments

Comments
 (0)