Merge branch 'main' into dev

oxmmty · Sep 19, 2024 · a2153c4 · a2153c4
2 parents 3fdb404 + d123cf7
commit a2153c4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/state.rs b/src/state.rs
@@ -3,7 +3,11 @@ use serde::{Deserialize, Serialize};
 
 
 // use cosmwasm_std::Addr;
+<<<<<<< dev
 use cw_storage_plus::{Item, Map};
+=======
+// use cw_storage_plus::{Item, Map};
+>>>>>>> main
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum GameStatus {