Removed conflict badge when conflict is solved
[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services /
drwxr-xr-x   ..
-rw-r--r-- 28024 FileDownloader.java
-rw-r--r-- 41533 FileUploader.java
-rw-r--r-- 7399 IndexedForest.java
-rw-r--r-- 938 OnUploadCompletedListener.java