Conflicts:
	src/main/AndroidManifest.xml
This commit is contained in:
iNPUTmice 2014-11-03 21:07:24 +01:00
commit 7d7be8efd8

View file

@ -65,6 +65,7 @@
<action android:name="android.nfc.action.NDEF_DISCOVERED" /> <action android:name="android.nfc.action.NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="xmpp" /> <data android:scheme="xmpp" />
<data android:mimeType="application/vnd.eu.siacs.conversations.jid" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity