From e76a9c06c33e21138c32a34432c3c405f5c737a9 Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Fri, 30 Jan 2015 17:02:53 +0100
Subject: Remove title_activity_conversations and use app_name instead

---
 src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f3d58d57..e4e91d80 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
 
         <activity
             android:name=".ui.ConversationActivity"
-            android:label="@string/title_activity_conversations"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
@@ -107,7 +107,7 @@
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ShareWithActivity"
-            android:label="@string/title_activity_conversations" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
-- 
cgit v1.2.3