An error occurred while fetching the assigned milestone of the selected merge_request.
+ 32
− 35
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -4,6 +4,7 @@ class Notifications implements EndpointInterface
@@ -61,7 +62,6 @@ class Notifications implements EndpointInterface
@@ -69,26 +69,7 @@ class Notifications implements EndpointInterface
@@ -103,7 +84,7 @@ class Notifications implements EndpointInterface
@@ -115,6 +96,32 @@ class Notifications implements EndpointInterface
@@ -197,25 +204,15 @@ class Notifications implements EndpointInterface