mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-23 16:40:36 +00:00
Code Issues Projects Releases Wiki Activity

resolve migration conflict

Browse source
This commit is contained in:
Hugh Rundle 2022-09-24 16:56:20 +10:00
parent 119b4bf2ff
commit fda150fa0d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bookwyrm/migrations/0158_auto_20220918_0936.py → bookwyrm/migrations/0159_auto_20220924_0634.py
View file

@ -1,4 +1,4 @@
# Generated by Django 3.2.15 on 2022-09-18 09:36
# Generated by Django 3.2.15 on 2022-09-24 06:34
from django.db import migrations, models
@ -6,28 +6,28 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("bookwyrm", "0157_auto_20220909_2338"),
('bookwyrm', '0158_auto_20220919_1634'),
]
operations = [
migrations.AddField(
model_name="user",
name="hotp_count",
model_name='user',
name='hotp_count',
field=models.IntegerField(blank=True, default=0, null=True),
),
migrations.AddField(
model_name="user",
name="hotp_secret",
model_name='user',
name='hotp_secret',
field=models.CharField(blank=True, default=None, max_length=32, null=True),
),
migrations.AddField(
model_name="user",
name="otp_secret",
model_name='user',
name='otp_secret',
field=models.CharField(blank=True, default=None, max_length=32, null=True),
),
migrations.AddField(
model_name="user",
name="two_factor_auth",
model_name='user',
name='two_factor_auth',
field=models.BooleanField(blank=True, default=None, null=True),
),
]