From 81de2ed62622e6516f5921910753ed1b39b8a294 Mon Sep 17 00:00:00 2001
From: Kanahia <kaushalkanahia@gmail.com>
Date: Wed, 10 Jul 2024 12:21:03 +0530
Subject: [PATCH] Fixed conflicts

---
 app/src/main/AndroidManifest.xml                               | 3 +++
 .../java/fr/free/nrw/commons/di/ActivityBuilderModule.java     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79640049b..87e182cc3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,9 @@
     android:theme="@style/LightAppTheme"
     tools:ignore="GoogleAppIndexingWarning"
     tools:replace="android:appComponentFactory">
+    <activity
+      android:name=".nearby.WikidataFeedback"
+      android:exported="false" />
     <activity
       android:name=".upload.UploadProgressActivity"
       android:exported="false" />
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
index dcd10ce0a..4516d806f 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
@@ -84,5 +84,7 @@ public abstract class ActivityBuilderModule {
 
     @ContributesAndroidInjector
     abstract UploadProgressActivity bindUploadProgressActivity();
+
+    @ContributesAndroidInjector
     abstract WikidataFeedback bindWikiFeedback();
 }