From a92ef6f07749b4b18cf3e9eb1722e572c545cabe Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 20 Mar 2016 02:33:15 +0100
Subject: fixed merge error

---
 .../java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3