diff options
Diffstat (limited to 'test/postman/10_Service_Order.postman_collection.json')
| -rw-r--r-- | test/postman/10_Service_Order.postman_collection.json | 5 |
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) |