Deleted more accidental lines

wmgeolab · Oct 27, 2024 · d21f699 · d21f699
1 parent 40d8d53
commit d21f699
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/backend/scopeBackend/views.py b/backend/scopeBackend/views.py
@@ -447,13 +447,7 @@ class TestView(viewsets.ModelViewSet):
 
     def get_queryset(self):
         return Response({"success":"Test view reached!"}, status=status.HTTP_200_OK)
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-# comment!
-=======
-=======
->>>>>>> 4bd4c5f16e01eaa11e64c9a5faad8d8a11ac19e9
+
 class AiResponseView(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated]
     serializer_class = AiResponseSerializer