bug fix

extedcouD · Feb 20, 2024 · 0a160eb · 0a160eb
1 parent e1dce97
commit 0a160eb
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/...tics-b2b/log-verification-utility/schema/logistics_api_json_schema/v1.2/onUpdateSchema.js b/...tics-b2b/log-verification-utility/schema/logistics_api_json_schema/v1.2/onUpdateSchema.js
@@ -157,11 +157,6 @@ module.exports = {
                       },
                       duration: {
                         type: "string",
-<<<<<<< HEAD
-                      },
-                      timestamp: {
-                        type: "string",
-=======
                         const: {
                           $data:
                             "/on_confirm/0/message/order/items/0/time/duration",
@@ -173,7 +168,6 @@ module.exports = {
                           $data:
                           "/on_confirm/0/message/order/items/0/time/timestamp",
                         },
->>>>>>> patch-reference-implementations-remote/main
                       },
                     },
                     required: ["label", "duration", "timestamp"],