aboutsummaryrefslogtreecommitdiffstats
path: root/test/postman/10_Service_Order.postman_collection.json
diff options
context:
space:
mode:
authorRene_Robert <rene.robert@orange.com>2019-07-30 17:11:26 +0200
committerRené ROBERT <rene.robert@orange.com>2019-08-01 06:42:30 +0000
commitf049426bfd8142f0ee9851d7ec6281b5c2b5f2e0 (patch)
tree3ccae4a6e74078824f53b6c49c0e19b2e16910af /test/postman/10_Service_Order.postman_collection.json
parent11b0d73014e1c680591f3989a8d54425f1383a15 (diff)
Issue-ID: INT-1178
updated Postman collection for Dublin Signed-off-by: Rene_Robert <rene.robert@orange.com> Change-Id: I94b9180e86b96f75780854211da67d85acc90d48 (cherry picked from commit 0ebd04f1cbce5640747b6791582c7b8db09ef8ea)
Diffstat (limited to 'test/postman/10_Service_Order.postman_collection.json')
-rw-r--r--test/postman/10_Service_Order.postman_collection.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/postman/10_Service_Order.postman_collection.json b/test/postman/10_Service_Order.postman_collection.json
index 2bcd4f9dc..f5ff2ab7c 100644
--- a/test/postman/10_Service_Order.postman_collection.json
+++ b/test/postman/10_Service_Order.postman_collection.json
@@ -1,3 +1,4 @@
+<<<<<<< HEAD (11b0d7 Fix typo in scale out documentation)
{
"variables": [],
"info": {
@@ -495,4 +496,6 @@
"response": []
}
]
-} \ No newline at end of file
+}
+=======
+>>>>>>> CHANGE (0ebd04 Issue-ID: INT-1178 updated Postman collection for Dublin)