aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 21:22:26 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 21:22:26 +0100
commit08cb23a88675bec7a382a8cdd463e9ea10358f64 (patch)
tree60745da206ddc791e5711eed9e448cc363dd30df /src/main
parent7d7be8efd8eef3b9fcadf83766dd26fb139e0976 (diff)
fixed merge errornfc
Diffstat (limited to 'src/main')
-rw-r--r--src/main/AndroidManifest.xml1
1 files changed, 0 insertions, 1 deletions
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