fix a conflict fuckup

toml01 · toml01 · commit 284a56b2c992 · 2022-10-25T17:25:25.000+03:00
diff --git a/packages/storage/src/keymap.rs b/packages/storage/src/keymap.rs
@@ -179,7 +179,6 @@ impl<'a, K: Serialize + DeserializeOwned, T: Serialize + DeserializeOwned, Ser:
     }
 
     /// internal item get function
- cosmwasm-v1.0
     fn _get_from_key(&self, storage: &dyn Storage, key: &K) -> StdResult<InternalItem<T, Ser>> {
         let key_vec = self.serialize_key(key)?;
         self.load_impl(storage, &key_vec)

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ impl<'a, K: Serialize + DeserializeOwned, T: Serialize + DeserializeOwned, Ser:`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`/// internal item get function`
`182`		`- cosmwasm-v1.0`
`183`	`182`	`fn _get_from_key(&self, storage: &dyn Storage, key: &K) -> StdResult<InternalItem<T, Ser>> {`
`184`	`183`	`let key_vec = self.serialize_key(key)?;`
`185`	`184`	`self.load_impl(storage, &key_vec)`