Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / OwnCloudFileObserver.java

diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index 2ea90c9..8f2e3ee 100644 (file)
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -29,6 +29,7 @@ import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 
 
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 
 

+

 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;