add apk

[pub/Android/ownCloud.git] / src / com / owncloud / android / db / ProviderMeta.java

diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index 7db74f0..f15dd9e 100644 (file)
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -72,7 +72,7 @@ public class ProviderMeta {
         public static final String FILE_REMOTE_ID = "remote_id";\r
         public static final String FILE_UPDATE_THUMBNAIL = "update_thumbnail";\r
         public static final String FILE_IS_DOWNLOADING= "is_downloading";\r
-        public static final String FILE_IN_CONFLICT = "in_conflict";\r
+        public static final String FILE_ETAG_IN_CONFLICT = "etag_in_conflict";\r
 \r
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME\r
                 + " collate nocase asc";\r