Fix merging conflict issues

readthedocs · Feb 15, 2018 · 6952e72 · 6952e72
1 parent 0430f0f
commit 6952e72
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/readthedocs/restapi/views/model_views.py b/readthedocs/restapi/views/model_views.py
@@ -6,6 +6,7 @@
 
 import logging
 
+from allauth.socialaccount.models import SocialAccount
 from django.shortcuts import get_object_or_404
 from rest_framework import decorators, permissions, status, viewsets
 from rest_framework.decorators import detail_route
@@ -28,7 +29,7 @@
     BuildAdminSerializer, BuildCommandSerializer, BuildSerializer,
     DomainSerializer, ProjectAdminSerializer, ProjectSerializer,
     RemoteOrganizationSerializer, RemoteRepositorySerializer,
-    VersionAdminSerializer, VersionSerializer)
+    SocialAccountSerializer, VersionAdminSerializer, VersionSerializer)
 
 log = logging.getLogger(__name__)