From 511cae22747e63913186afe038420f42856ffbab Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Sat, 5 Oct 2024 22:05:21 +0000
Subject: [PATCH] slimlauncher - fix rebase

---
 metadata/com.sduduzog.slimlauncher.yml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/metadata/com.sduduzog.slimlauncher.yml b/metadata/com.sduduzog.slimlauncher.yml
index df97515713..d9203ba53b 100644
--- a/metadata/com.sduduzog.slimlauncher.yml
+++ b/metadata/com.sduduzog.slimlauncher.yml
@@ -139,25 +139,8 @@ Builds:
       - yes
     prebuild: sed -i -e '/play\ {/,+11d' -e '/triplet/d' build.gradle.kts
 
-<<<<<<< HEAD
-  - versionName: 2.4.21
-    versionCode: 55
-    disable: https://github.com/sduduzog/slim-launcher/issues/153
-    commit: 2f18db2985edf3224939e22c5934076d2c26c780
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/play\ {/,+11d' -e '/triplet/d' build.gradle.kts
-
-<<<<<<< HEAD
-=======
->>>>>>> 1f27db4903d3c5934524c872af52b57306dfef52
 ArchivePolicy: 0
 AutoUpdateMode: None
 UpdateCheckMode: None
-=======
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
->>>>>>> f28b6d57b844efb54e594dbe803f7c2bd632085c
-CurrentVersion: 2.4.21
-CurrentVersionCode: 55
+CurrentVersion: 2.4.20
+CurrentVersionCode: 54