debug

Author: augsaksham

coreapi/views.py

@@ -193,7 +193,6 @@ def post(self, request):
                 return Response(result, status=status.HTTP_400_BAD_REQUEST)
 
 
-<<<<<<< HEAD
 class LatexGenerate(views.APIView):
     """     To generate caption from an image
     Workflow
@@ -248,8 +247,6 @@ def post(self, request):
                 return Response(result, status=status.HTTP_400_BAD_REQUEST)
 
 
-=======
->>>>>>> 057c9b8b0d7225043e318095c8d4168004d3d367
 class NsfwRecognise(views.APIView):
     """     To recognise whether a image is nsfw or not
     Workflow