Merge pull request #740 from owncloud/revert-669-master

[pub/Android/ownCloud.git] / src / com / owncloud / android / services / observer / FolderObserver.java

diff --git a/src/com/owncloud/android/services/observer/FolderObserver.java b/src/com/owncloud/android/services/observer/FolderObserver.java
index ea1a9ed..67b41a1 100644 (file)
--- a/src/com/owncloud/android/services/observer/FolderObserver.java
+++ b/src/com/owncloud/android/services/observer/FolderObserver.java
@@ -30,9 +30,9 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;

+import com.owncloud.android.lib.common.utils.Log_OC;

 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;

-import com.owncloud.android.utils.Log_OC;

 
 /**
  * Observer watching a folder to request the synchronization of kept-in-sync files
 
 /**
  * Observer watching a folder to request the synchronization of kept-in-sync files