Style fix for cargo fmt check

near · Nov 1, 2023 · 330fb76 · 330fb76
1 parent d0a8e78
commit 330fb76
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/primitives-core/src/runtime/fees.rs b/core/primitives-core/src/runtime/fees.rs
@@ -245,9 +245,13 @@ pub fn transfer_send_fee(
         (true, AccountType::EthImplicitAccount) => transfer_fee,
         // Extra fees for the CreateAccount and AddFullAccessKey.
         (true, AccountType::NearImplicitAccount) => {
+<<<<<<< HEAD
             transfer_fee
                 + cfg.fee(ActionCosts::create_account).send_fee(sender_is_receiver)
                 + cfg.fee(ActionCosts::add_full_access_key).send_fee(sender_is_receiver)
+=======
+            transfer_fee + create_account_fee + add_access_key_fee
+>>>>>>> a96103cbc (Style fix for cargo fmt check)
         }
     }
 }