From 39ca51312f163fceea5fee4c275560f43f042fdf Mon Sep 17 00:00:00 2001
From: Christian Rowlands <christian.rowlands@gmail.com>
Date: Mon, 25 Mar 2024 09:22:47 -0400
Subject: [PATCH] Update the README with the correct build command and remove
 the icon override

---
 README.md                             | 7 +++----
 src/conversations/AndroidManifest.xml | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 939ba19b1..bb74b355d 100644
--- a/README.md
+++ b/README.md
@@ -25,12 +25,12 @@ modified. Conversations.im is an outstanding app so hats off to Daniel Gultsch!
 
 To build a development debug version of Ninja Chat, you can use the command:
 ```
-./gradlew assembleConversationsFreeSystemDebug
+./gradlew assembleConversationsFreeDebug
 ```
 
 To build and install the apk onto a connected device us the command:
 ```
-./gradlew installConversationsFreeSystemDebug
+./gradlew installConversationsFreeDebug
 ```
 
 ### Release
@@ -45,13 +45,12 @@ keystore.alias=
 
 Then, build the release bundle using the following command
 ```
-./gradlew bundleConversationsFreeSystemRelease
+./gradlew bundleConversationsFreeRelease
 ```
 
 There is also a GitLab CI/CD job setup to build the release APK and bundle.
 
 ----- Everything that follows in this README is from the original Conversations.im repo. -----
->>>>>>> ninja-master
 
 ## Design principles
 
diff --git a/src/conversations/AndroidManifest.xml b/src/conversations/AndroidManifest.xml
index 560626ae1..ea481b29f 100644
--- a/src/conversations/AndroidManifest.xml
+++ b/src/conversations/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <application tools:replace="android:icon" android:icon="@mipmap/new_launcher">
+    <application>
         <activity
             android:name=".ui.ManageAccountActivity"
             android:label="@string/title_activity_manage_accounts"