From 1a3045190c656361ca1131c63eca8807124544bc Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <dshiposha@usetech.com>
Date: Fri, 12 Aug 2022 13:17:14 +0000
Subject: [PATCH] fix after conflict


---
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -501,10 +501,10 @@
 
 			<Pallet<T>>::deposit_event(Event::<T>::CollectionAdminAdded(
 				collection_id,
-				new_admin.clone()
+				new_admin_id.clone()
 			));
 
-			<PalletCommon<T>>::toggle_admin(&collection, &sender, &new_admin, true)
+			<PalletCommon<T>>::toggle_admin(&collection, &sender, &new_admin_id, true)
 		}
 
 		/// Remove admin of a collection.

-- 
gitstuff