From 5c2a79361a937b076bfd33b52d6c3230cc295a3d Mon Sep 17 00:00:00 2001 From: Sam Whited <sam@samwhited.com> Date: Thu, 16 Oct 2014 10:54:05 -0400 Subject: [PATCH] Fix problem when merging manifests --- AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3263cdd62..d65f747e0 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" />