aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-15 19:18:38 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-15 19:18:38 +0200
commit5501502e893f3a1a38881aac1d2acc14365f4d17 (patch)
tree71ab51f13a55c621a68aa26a6f32500e40f25b70 /src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
parent11fbc3d79e5896a4ba7d7e0c0c68415824c7b8cd (diff)
parent83e1e6468e1ade8f70601195e8c0f2435fec9b25 (diff)
Merge branch 'depend_on_sm' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
index 398102e1..daf54b51 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
@@ -2,9 +2,9 @@ package eu.siacs.conversations.xmpp.stanzas;
import eu.siacs.conversations.xml.Element;
-public class IqPacket extends AbstractStanza {
+public class IqPacket extends AbstractAcknowledgeableStanza {
- public static enum TYPE {
+ public enum TYPE {
ERROR,
SET,
RESULT,