From 3aba596226ee0ccff0d12a5ebb4b943b4172fe5c Mon Sep 17 00:00:00 2001
From: AhzamAkhtar <ahzam8186@gmail.com>
Date: Tue, 7 Jan 2025 22:05:18 +0530
Subject: [PATCH] conflict resolved

---
 integration_tests/tests/integration_tests/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration_tests/tests/integration_tests/main.rs b/integration_tests/tests/integration_tests/main.rs
index 4e6bcb07..5d6dfb6f 100644
--- a/integration_tests/tests/integration_tests/main.rs
+++ b/integration_tests/tests/integration_tests/main.rs
@@ -6,7 +6,7 @@ mod general_scenario_tests;
 mod mpl_core_tests;
 mod nft_editions_tests;
 mod regular_nft_tests;
-mod token_type_test;
 mod show_inscription_flag_tests;
 mod test_show_zero_balance_filter;
 mod token_accounts_tests;
+mod token_type_test;