Update settings.

toddbirchard · toddbirchard · commit eb9b11a249b7 · 2024-01-13T04:06:00.000Z
diff --git a/django_views_tutorial/settings.py b/django_views_tutorial/settings.py
@@ -83,10 +83,6 @@
     }
 }
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
-<<<<<<< HEAD
-
-=======
->>>>>>> 458242c3b68e332a9df47bcc287574a8cc6c8035
 
 # Password validation
 AUTH_PASSWORD_VALIDATORS = [

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,6 @@`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"`
`86`		`-<<<<<<< HEAD`
`87`		`-`
`88`		`-=======`
`89`		`->>>>>>> 458242c3b68e332a9df47bcc287574a8cc6c8035`
`90`	`86`
`91`	`87`	`# Password validation`
`92`	`88`	`AUTH_PASSWORD_VALIDATORS = [`