From b74d312214a57a4287e86664636be005ca3547c3 Mon Sep 17 00:00:00 2001
From: "Omer I.S." <omeritzicschwartz@gmail.com>
Date: Wed, 6 May 2026 04:28:53 +0300
Subject: [PATCH] Fix merge conflicts in android/build.gradle.kts

---
 android/build.gradle.kts | 41 ----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 257322553..fdeb197b1 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -22,47 +22,6 @@ subprojects {
         project.evaluationDependsOn(":app")
     }
     
-<<<<<<< HEAD
-    // Special handling for android_package_manager plugin for AGP 9 compatibility
-    if (project.name == "android_package_manager") {
-        project.logger.lifecycle("Configuring android_package_manager for AGP 9 compatibility")
-        
-        // Fix manifest by removing package attribute during build
-        project.tasks.whenTaskAdded { task ->
-            if (task.name == "processReleaseManifest" || task.name == "processDebugManifest") {
-                task.doFirst {
-                    val manifestFile = file("${project.projectDir}/src/main/AndroidManifest.xml")
-                    if (manifestFile.exists()) {
-                        val manifestContent = manifestFile.readText()
-                        val fixedContent = manifestContent.replace(
-                            Regex("""package="[^"]*"""), 
-                            ""
-                        )
-                        manifestFile.writeText(fixedContent)
-                        project.logger.lifecycle("Fixed AndroidManifest.xml for android_package_manager")
-                    }
-                }
-            }
-        }
-        
-        project.afterEvaluate {
-            if (project.hasProperty("android")) {
-                try {
-                    val android = project.extensions.getByName("android") as com.android.build.gradle.LibraryExtension
-                    if (android.namespace == null) {
-                        android.namespace = "com.android_package_manager"
-                        project.logger.lifecycle("Set namespace for android_package_manager: ${android.namespace}")
-                    }
-                } catch (e: Exception) {
-                    println("Warning: Could not configure namespace for android_package_manager: ${e.message}")
-                }
-            }
-        }
-        
-=======
-            
->>>>>>> 6057f431 (Revert to AGP 8 and remove submodule approach)
-        return@subprojects
     }
 }