resolved merge conflict

CONTRIBUTORS.rst

@@ -63,6 +63,7 @@ Listed in alphabetical order.
   Daniele Tricoli          `@eriol`_
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto
   Davur Clementsen         `@dsclementsen`_             @davur
+  Eraldo Energy            `@eraldo`_
   Eyad Al Sibai            `@eyadsibai`_
   Felipe Arruda            `@arruda`_
   Garry Cairns             `@garry-cairns`_
@@ -106,6 +107,7 @@ Listed in alphabetical order.
 .. _@ad-m: https://github.com/ad-m
 .. _@alb3rto: https://github.com/alb3rto
 .. _@caffodian: https://github.com/caffodian
+.. _@eraldo: https://github.com/eraldo
 .. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
 .. _@amjith: https://github.com/amjith
 .. _@zcho: https://github.com/zcho

{{cookiecutter.repo_name}}/config/settings/common.py

@@ -211,9 +211,10 @@ AUTHENTICATION_BACKENDS = (
 ACCOUNT_AUTHENTICATION_METHOD = 'username'
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
-ACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapter.AccountAdapter'
-SOCIALACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapter.SocialAccountAdapter'
+
 ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True)
+ACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapters.AccountAdapter'
+SOCIALACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapters.SocialAccountAdapter'
 
 # Custom user app defaults
 # Select the correct user model