Browse Source

perf: 修改去掉冲突

pull/11111/head
ibuler 1 year ago
parent
commit
2c22396093
  1. 5
      apps/terminal/migrations/0064_auto_20230728_1001.py
  2. 18
      apps/terminal/migrations/0064_sessionsharing_origin.py

5
apps/terminal/migrations/0064_auto_20230728_1001.py

@ -20,4 +20,9 @@ class Migration(migrations.Migration):
name='auto_create_accounts',
field=models.BooleanField(default=True, verbose_name='Auto create accounts'),
),
migrations.AddField(
model_name='sessionsharing',
name='origin',
field=models.URLField(blank=True, null=True, verbose_name='Origin'),
),
]

18
apps/terminal/migrations/0064_sessionsharing_origin.py

@ -1,18 +0,0 @@
# Generated by Django 4.1.10 on 2023-07-26 10:55
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('terminal', '0063_auto_20230621_1133'),
]
operations = [
migrations.AddField(
model_name='sessionsharing',
name='origin',
field=models.URLField(blank=True, null=True, verbose_name='Origin'),
),
]
Loading…
Cancel
Save