X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7f34fba421ba20cba626463ff8181ad9f89b5997..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index 61ac8f5f..2d13a66b 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -18,14 +18,13 @@
 
 package com.owncloud.android.ui.activity;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
+import com.owncloud.android.utils.Log_OC;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -81,7 +80,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
                 finish();
             } else {
                 /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
-                DataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
+                FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
                 file = storageManager.getFileByPath(file.getRemotePath());   // file = null if not in the current Account
                 if (file != null) {
                     setFile(file);