From d21f699110d2027dab3c38ae152bd9f6eca76e8c Mon Sep 17 00:00:00 2001
From: lgwallis <127695345+lgwallis@users.noreply.github.com>
Date: Sun, 27 Oct 2024 12:48:35 -0400
Subject: [PATCH] Deleted more accidental lines

---
 backend/scopeBackend/views.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/backend/scopeBackend/views.py b/backend/scopeBackend/views.py
index 94c715d..7ed3c81 100644
--- 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