mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-28 11:42:15 -05:00
Fix problem when merging manifests
This commit is contained in:
parent
88d88ffb7b
commit
5c2a79361a
@ -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" />
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user