resolve migration conflict

This commit is contained in:
Hugh Rundle 2022-09-24 16:56:20 +10:00
parent 119b4bf2ff
commit fda150fa0d

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 from django.db import migrations, models
@ -6,28 +6,28 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("bookwyrm", "0157_auto_20220909_2338"), ('bookwyrm', '0158_auto_20220919_1634'),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name="user", model_name='user',
name="hotp_count", name='hotp_count',
field=models.IntegerField(blank=True, default=0, null=True), field=models.IntegerField(blank=True, default=0, null=True),
), ),
migrations.AddField( migrations.AddField(
model_name="user", model_name='user',
name="hotp_secret", name='hotp_secret',
field=models.CharField(blank=True, default=None, max_length=32, null=True), field=models.CharField(blank=True, default=None, max_length=32, null=True),
), ),
migrations.AddField( migrations.AddField(
model_name="user", model_name='user',
name="otp_secret", name='otp_secret',
field=models.CharField(blank=True, default=None, max_length=32, null=True), field=models.CharField(blank=True, default=None, max_length=32, null=True),
), ),
migrations.AddField( migrations.AddField(
model_name="user", model_name='user',
name="two_factor_auth", name='two_factor_auth',
field=models.BooleanField(blank=True, default=None, null=True), field=models.BooleanField(blank=True, default=None, null=True),
), ),
] ]