Fix merge issues

CosmWasm · May 31, 2024 · 55836d1 · 55836d1
1 parent 631cd57
commit 55836d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/packages/std/src/testing/message_info.rs b/packages/std/src/testing/message_info.rs
@@ -49,11 +49,8 @@ pub fn message_info(sender: &Addr, funds: &[Coin]) -> MessageInfo {
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_core::Uint128;
-
-    use crate::coins;
-
     use super::*;
+    use crate::{coins, Uint128};
 
     #[test]
     fn message_info_works() {

diff --git a/packages/std/src/testing/mod.rs b/packages/std/src/testing/mod.rs
@@ -3,11 +3,8 @@
 // Exposed for testing only
 // Both unit tests and integration tests are compiled to native code, so everything in here does not need to compile to Wasm.
 
-<<<<<<< HEAD
 mod assertions;
-=======
 mod message_info;
->>>>>>> 70f880921 (Add message_info function)
 mod mock;
 
 pub use assertions::assert_approx_eq_impl;