From 98e61f189c5f8bce7a001997fa2352c0c27f2778 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 20 Mar 2016 01:59:41 +0100
Subject: fixed merge errors

---
 src/main/java/eu/siacs/conversations/utils/FileUtils.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/eu/siacs/conversations/utils/FileUtils.java')

diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
index 0edaf9a9..7783bcc9 100644
--- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
@@ -11,6 +11,8 @@ import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
+import java.io.File;
+
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 
 public final class FileUtils {
-- 
cgit v1.2.3