{dev bugfix} merge conflict

app/accesslayer/views.py

@@ -38,8 +38,6 @@ class Login(ObtainAuthToken):
 
             return Response({
                 'token': token.key,
-                # 'user_id': user.pk,
-                # 'email': user.email
             })
         except Exception as e:
             return Response(
@@ -84,7 +82,6 @@ class RefreshToken(APIView):
 
 
 class CurrentUser(APIView):
-    # @decorators.error_safe
     def get(self, request, token=None, *args, **kwargs):
         serializer = UserManagementRetreiveSerializer
         

app/applicationlayer/cms/form/header/views.py

@@ -213,7 +213,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('date_required_to'),
             request.query_params.get('form_type'),
         )
-        
         awaiting_filtered = change_request.filter_awaiting(self.queryset, id_number)
 
         awaiting = awaiting_filtered.count()