An error occurred while fetching the assigned milestone of the selected merge_request.
- dockx thibault authored
+ 56
− 56
Conflict: This file was added both in the source and target branches, but with different contents.
Ask someone with write access to resolve it.
@@ -6,7 +6,7 @@ class Archive implements EndpointInterface
@@ -6,7 +6,7 @@ class Archive implements EndpointInterface
@@ -15,7 +15,7 @@ class Archive implements EndpointInterface
@@ -15,7 +15,7 @@ class Archive implements EndpointInterface
@@ -27,7 +27,7 @@ class Archive implements EndpointInterface
@@ -27,7 +27,7 @@ class Archive implements EndpointInterface
@@ -37,38 +37,38 @@ class Archive implements EndpointInterface
@@ -37,38 +37,38 @@ class Archive implements EndpointInterface
$archiveUrl = $_ENV['FUSION_DIRECTORY_API_URL'] . '/archive/user/' . rawurlencode($task['fdtasksgranulardn'][0]);
$webServiceCall->setCurlSettings($archiveUrl, NULL, 'POST'); // Update settings for the archive request
@@ -79,7 +79,7 @@ class Archive implements EndpointInterface
@@ -79,7 +79,7 @@ class Archive implements EndpointInterface
@@ -89,7 +89,7 @@ class Archive implements EndpointInterface
@@ -89,7 +89,7 @@ class Archive implements EndpointInterface
@@ -99,7 +99,7 @@ class Archive implements EndpointInterface
@@ -99,7 +99,7 @@ class Archive implements EndpointInterface
@@ -107,31 +107,31 @@ class Archive implements EndpointInterface
@@ -107,31 +107,31 @@ class Archive implements EndpointInterface
if (!isset($supannState[0]['supannressourceetatdate']) || !is_array($supannState[0]['supannressourceetatdate'])) {
\ No newline at end of file