From a02c09ebae5b7675ead819bc0825ea3a399eedd7 Mon Sep 17 00:00:00 2001
From: NachoPal <ignacio.palacios.santos@gmail.com>
Date: Mon, 16 Oct 2023 12:27:40 +0200
Subject: [PATCH] fix conflicts 2

---
 .../asset-hub-kusama/src/weights/pallet_assets_local.rs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs
index 4e06fa5a70..849b7161a8 100644
--- a/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs
+++ b/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs
@@ -126,7 +126,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
-            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
 			.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
 	}
 	/// Storage: `Assets::Asset` (r:1 w:1)