aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-16 10:54:05 -0400
committerSam Whited <sam@samwhited.com>2014-10-16 10:54:05 -0400
commit5c2a79361a937b076bfd33b52d6c3230cc295a3d (patch)
treea6e2e7bbdf966a3d8fea0ece7b4d1c0f6ed319b1
parent88d88ffb7b704e2ae5a2eaf1af6e8a21fb0fb574 (diff)
Fix problem when merging manifests
-rw-r--r--AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3263cdd6..d65f747e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="eu.siacs.conversations"
android:versionCode="31"
android:versionName="0.7.3" >
@@ -22,6 +23,7 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
+ tools:replace="android:label"
android:theme="@style/ConversationsTheme" >
<service android:name="eu.siacs.conversations.services.XmppConnectionService" />