From b982bc787a4ae72d1a8aa4ba27816da19695e517 Mon Sep 17 00:00:00 2001
From: jia <jmessage@163.com>
Date: Wed, 26 Feb 2025 01:04:23 +0800
Subject: [PATCH] feat

---
 gradle.properties | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b151752a8..e65d00cfd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,10 +26,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-<<<<<<< HEAD
-versionCode=57
-versionName=4.11.11
-=======
 versionCode=101
 versionName=4.12.01
->>>>>>> release-20250211
+