From 08cb23a88675bec7a382a8cdd463e9ea10358f64 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 3 Nov 2014 21:22:26 +0100
Subject: fixed merge error

---
 src/main/AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index db503ae8..95663a87 100644
--- 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
-- 
cgit v1.2.3