F

MystenLabs · Oct 21, 2022 · f3f29af · f3f29af
1 parent 66f4de4
commit f3f29af
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/crates/sui-cost/tests/snapshots/empirical_transaction_cost__good_snapshot-2.snap b/crates/sui-cost/tests/snapshots/empirical_transaction_cost__good_snapshot-2.snap
@@ -4,13 +4,23 @@ expression: common_costs_estimate
 ---
 {
   "MergeCoin": {
+<<<<<<< HEAD
     "computation_cost": 6724,
     "storage_cost": 6968,
     "storage_rebate": 0
   },
   "Publish": {
     "computation_cost": 6713,
     "storage_cost": 6903,
+=======
+    "computation_cost": 6863,
+    "storage_cost": 7174,
+    "storage_rebate": 0
+  },
+  "Publish": {
+    "computation_cost": 6852,
+    "storage_cost": 7110,
+>>>>>>> eea1f5632 (F)
     "storage_rebate": 0
   },
   "SharedCounterAssertValue": {
@@ -29,8 +39,13 @@ expression: common_costs_estimate
     "storage_rebate": 0
   },
   "SplitCoin": {
+<<<<<<< HEAD
     "computation_cost": 6702,
     "storage_cost": 6935,
+=======
+    "computation_cost": 6842,
+    "storage_cost": 7142,
+>>>>>>> eea1f5632 (F)
     "storage_rebate": 0
   },
   "TransferPortionSuiCoin": {