Revert "migrate pallet-statement to use umbrella crate"

This reverts commit fed7211.
paritytech · Jan 12, 2025 · 49335d8 · 49335d8
1 parent b7e523e
commit 49335d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/frame/statement/src/mock.rs b/substrate/frame/statement/src/mock.rs
@@ -74,8 +74,11 @@ impl Config for Test {
 	type MaxAllowedBytes = ConstU32<MAX_ALLOWED_BYTES>;
 }
 
+<<<<<<< HEAD
 pub fn new_test_ext() -> TestState {
 pub fn new_test_ext() -> sp_io::TestExternalities {
+=======
+>>>>>>> parent of fed7211911 (migrate pallet-statement to use umbrella crate)
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	let balances = pallet_balances::GenesisConfig::<Test> {