fixed merge error

2014-11-03 21:22:26 +01:00 · 2014-11-03 21:22:26 +01:00 · 08cb23a886
parent 7d7be8efd8
commit 08cb23a886
1 changed files with 0 additions and 1 deletions
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@ -65,7 +65,6 @@
                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
                <category android:name="android.intent.category.DEFAULT" />
                <data android:scheme="xmpp" />
-                <data android:mimeType="application/vnd.eu.siacs.conversations.jid" />
            </intent-filter>
        </activity>
        <activity