From 64582629c3af0a7375adeac4333bdcc981826278 Mon Sep 17 00:00:00 2001
From: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
Date: Thu, 2 May 2024 18:01:00 -0700
Subject: [PATCH] Moved to new location

---
 .gitmodules | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bc75c300..140c1717 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -70,12 +70,6 @@
 [submodule "BadUSB/BadGPT"]
 	path = BadUSB/BadGPT
 	url = https://github.com/ooovenenoso/BadUSB-GPT
-<<<<<<< HEAD
-[submodule "NFC/Infinity"]
-	path = NFC/Infinity
-	url = https://github.com/FalsePhilosopher/Flipper-Infinity
 [submodule "NFC/Amiibo/Infinity-FalsePhilosopher"]
 	path = NFC/Amiibo/Infinity-FalsePhilosopher
-	url = https://github.com/FalsePhilosopher/Flipper-Infinity
-=======
->>>>>>> 362f5cac03daa2179937ad9e5ac3748ed4b7bcbc
+	url = https://github.com/FalsePhilosopher/Flipper-Infinity
\ No newline at end of file