Issue-ID: INT-1178

[integration.git] / test / postman / 10_Service_Order.postman_collection.json

diff --git a/test/postman/10_Service_Order.postman_collection.json b/test/postman/10_Service_Order.postman_collection.json
index 2bcd4f9..f5ff2ab 100644 (file)
--- 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)