From 77acc93b04dd58a217f27013179654e2e2a6ce06 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Rios <juani.rios.99@gmail.com>
Date: Thu, 18 Apr 2024 12:06:48 +0200
Subject: [PATCH] instantiator tests

---
 pallets/funding/src/instantiator/mod.rs   | 20 ++++++++++++++++++++
 pallets/funding/src/instantiator/tests.rs |  0
 2 files changed, 20 insertions(+)
 create mode 100644 pallets/funding/src/instantiator/tests.rs

diff --git a/pallets/funding/src/instantiator/mod.rs b/pallets/funding/src/instantiator/mod.rs
index 885b573f1..e471e1658 100644
--- a/pallets/funding/src/instantiator/mod.rs
+++ b/pallets/funding/src/instantiator/mod.rs
@@ -53,6 +53,7 @@ use sp_std::{
 };
 
 pub mod macros;
+<<<<<<< HEAD
 pub use macros::*;
 pub mod types;
 pub use types::*;
@@ -61,6 +62,25 @@ pub use traits::*;
 #[cfg(feature = "std")]
 pub mod async_features;
 mod functions;
+=======
+<<<<<<< HEAD
+pub mod types;
+<<<<<<< HEAD
+#[cfg(feature = "std")]
+pub mod async_features;
+mod traits;
+=======
+mod async_features;
+=======
+<<<<<<< HEAD
+mod types;
+=======
+mod tests;
+>>>>>>> 38725a29 (instantiator tests)
+>>>>>>> 8ef65884 (instantiator tests)
+
+>>>>>>> e7bc8a12 (instantiator tests)
+>>>>>>> ffb38372 (instantiator tests)
 
 
 
diff --git a/pallets/funding/src/instantiator/tests.rs b/pallets/funding/src/instantiator/tests.rs
new file mode 100644
index 000000000..e69de29bb