aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-03-26 11:17:48 +0100
committerChristian S <christian@pix-art.de>2016-03-26 11:17:48 +0100
commit927dde01a827a91a24495bd868575cefd981f8c2 (patch)
treef09ed178937f28b85d1499951cff3faa64988250 /src/main/java/eu/siacs/conversations/generator/IqGenerator.java
parent67eb44af3c5012cdc2da3af4ae94cf7fa51a3ef1 (diff)
parent46be514b4db1cb8c17037ac6cd307078e4794a12 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/IqGenerator.java')
-rw-r--r--src/main/java/eu/siacs/conversations/generator/IqGenerator.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index 15e27fc06..d8a0572b6 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -25,7 +25,6 @@ import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.Xmlns;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.forms.Data;
-import eu.siacs.conversations.xmpp.forms.Field;
import eu.siacs.conversations.xmpp.jid.Jid;
import eu.siacs.conversations.xmpp.pep.Avatar;
import eu.siacs.conversations.xmpp.stanzas.IqPacket;