Skip to content

Commit 7fd8a79

Browse files
committed
ref: 2.3.グループ管理連携機能開発: Resolve migrations conflict
1 parent 7bdec03 commit 7fd8a79

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.28 on 2026-03-25 09:57
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('osf', '0264_merge_20260223_0712'),
12+
('osf', '0264_merge_20260218_0749'),
13+
]
14+
15+
operations = [
16+
]

0 commit comments

Comments
 (0)