diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 01:59:41 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 01:59:41 +0100 |
| commit | 98e61f189c5f8bce7a001997fa2352c0c27f2778 (patch) | |
| tree | 95c8b87a1a561a10917537e17122667a2eea9d88 /src/main/java/de | |
| parent | fb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (diff) | |
fixed merge errors
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java index 992776e5..03401e3c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java @@ -15,7 +15,6 @@ import de.thedevstack.conversationsplus.ConversationsPlusApplication; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.enums.UserDecision; import de.thedevstack.conversationsplus.exceptions.UiException; -import de.thedevstack.conversationsplus.utils.FileUtils; import de.thedevstack.conversationsplus.utils.ImageUtil; import de.thedevstack.conversationsplus.utils.MessageUtil; import de.thedevstack.conversationsplus.utils.StreamUtil; @@ -28,6 +27,7 @@ import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.ui.UiCallback; import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.utils.FileUtils; /** * Created by tzur on 31.10.2015. |