projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
[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
..
5383520
100644
(file)
--- a/
src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/
src/com/owncloud/android/files/OwnCloudFileObserver.java
@@
-83,7
+83,6
@@
public class OwnCloudFileObserver extends FileObserver {
storageManager,
mOCAccount,
true,
- true,
mContext);
RemoteOperationResult result = sfo.execute(mOCAccount, mContext);
if (result.getCode() == ResultCode.SYNC_CONFLICT) {