Pull chain metadata

entropyxyz · Aug 19, 2024 · 76d95eb · 76d95eb
1 parent 7843545
commit 76d95eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/crates/client/entropy_metadata.scale b/crates/client/entropy_metadata.scale
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -1562,11 +1562,8 @@ construct_runtime!(
     TransactionPause: pallet_transaction_pause = 54,
     Propagation: pallet_propagation = 55,
     Parameters: pallet_parameters = 56,
-<<<<<<< HEAD
-    Attestation: pallet_attestation = 57,
-=======
     Oracle: pallet_oracle = 57,
->>>>>>> master
+    Attestation: pallet_attestation = 58,
   }
 );