diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 02:33:15 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 02:34:01 +0100 |
| commit | a92ef6f07749b4b18cf3e9eb1722e572c545cabe (patch) | |
| tree | 98aea4177d6f8e53b9c7de6b0362d17ae309a2bf | |
| parent | 75c8a4a6953fb5dd0cb07fdf51a50f65cf65e1cf (diff) | |
fixed merge error
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java index e6049c08..8cb71308 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java @@ -28,7 +28,7 @@ import de.thedevstack.conversationsplus.R; import de.thedevstack.conversationsplus.entities.Account; import de.thedevstack.conversationsplus.entities.Conversation; import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversations.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService; import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; |