From 4bd96c3c536117c086198fd992491684511ae187 Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <dshiposha@usetech.com>
Date: Fri, 12 Aug 2022 13:10:55 +0000
Subject: [PATCH] fix(rft): conflicts


---
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -424,10 +424,8 @@
 		<TokensBurnt<T>>::insert(collection.id, burnt);
 		<TokenProperties<T>>::remove((collection.id, token_id));
 		<TotalSupply<T>>::remove((collection.id, token_id));
-<<<<<<< HEAD
-		<Balance<T>>::remove_prefix((collection.id, token_id), None);
-		<Allowance<T>>::remove_prefix((collection.id, token_id), None);
-
+		let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
+		let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
 		<PalletEvm<T>>::deposit_log(
 			ERC721Events::Transfer {
 				from: *owner.as_eth(),
@@ -436,11 +434,6 @@
 			}
 			.to_log(collection_id_to_address(collection.id)),
 		);
-=======
-		let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
-		let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
-		// TODO: ERC721 transfer event
->>>>>>> 5d9665e0... refactor: switch to new prefix removal methods
 		Ok(())
 	}
 

-- 
gitstuff