From 84d11f289fb8a649bd492d62f4cda4db7792bfc5 Mon Sep 17 00:00:00 2001
From: QIU <Kero64@126.com>
Date: Wed, 5 Aug 2026 06:33:54 +0000
Subject: [PATCH] fix(ft8): remove application tag from module manifest (merge
 conflict)

feature/ft8 module manifest carried an application element from the
FT8CN standalone app (allowBackup/icon/label/usesCleartextTraffic),
clashing with the main app manifest at merge (allowBackup false vs
true, icon, label). Removed the tag - components (activities, service,
permissions) remain and merge cleanly. Verified: processRelease-
MainManifest + mergeReleaseResources BUILD SUCCESSFUL.
---
 feature/ft8/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/feature/ft8/src/main/AndroidManifest.xml b/feature/ft8/src/main/AndroidManifest.xml
index f342e9d9..12daf62d 100644
--- a/feature/ft8/src/main/AndroidManifest.xml
+++ b/feature/ft8/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <application>
         <activity
             android:name=".grid_tracker.GridTrackerMainActivity"
             android:screenOrientation="sensorLandscape"
@@ -78,4 +79,5 @@
         </provider>
 
 
+    </application>
 </manifest>
\ No newline at end of file