Commit bbb04acb authored by Kevin Mentzoni Halvarsson's avatar Kevin Mentzoni Halvarsson
Browse files

Fixed merge conflict that wasnt saved

parent d1fed031
Pipeline #129632 failed with stages
......@@ -13,16 +13,11 @@ from workouts.permissions import IsOwner, IsReadOnly
class CommentList(
mixins.ListModelMixin, mixins.CreateModelMixin, generics.GenericAPIView
):
<<<<<<< HEAD
"""Endpoint for fetching all comments associated with the workout PK and creating a new comment
"""
=======
"""
Endpoint for fetching all comments associated with the workout PK
and creating a new comment
"""
>>>>>>> master
serializer_class = CommentSerializer
permission_classes = [permissions.IsAuthenticated]
filter_backends = [OrderingFilter]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment