resolve rebase conflict

n2ygk · n2ygk · commit 4a4693b252ff · 2024-08-13T10:33:08.000-04:00
diff --git a/oauth2_provider/migrations/0012_add_token_checksum.py b/oauth2_provider/migrations/0012_add_token_checksum.py
@@ -6,7 +6,8 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("oauth2_provider", "0010_application_allowed_origins"),
+        ("oauth2_provider", "0011_refreshtoken_token_family"),
+        migrations.swappable_dependency(settings.OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL),
     ]
 
     operations = [

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`
`7`	`7`	`class Migration(migrations.Migration):`
`8`	`8`	`dependencies = [`
`9`		`- ("oauth2_provider", "0010_application_allowed_origins"),`
	`9`	`+ ("oauth2_provider", "0011_refreshtoken_token_family"),`
	`10`	`+ migrations.swappable_dependency(settings.OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL),`
`10`	`11`	`]`
`11`	`12`
`12`	`13`	`operations = [`