From d744c4c8aedc02d9d95073abdfc61eb479525934 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 27 Sep 2023 20:59:31 +0200
Subject: [PATCH] RetroDECK v0.7.2b

---
 net.retrodeck.retrodeck.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index a08964dc..75c5a63f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1261,8 +1261,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-<<<<<<< HEAD
-        branch: main
-=======
         branch: THISBRANCH
->>>>>>> cooker-0.7.2b