Removed conflict badge when conflict is solved
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Aug 2015 09:35:04 +0000 (11:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Sep 2015 13:13:49 +0000 (15:13 +0200)
commit7399508e050d9a2bf5a44188b6abc46501b19357
tree23bb407ef72dc3e6d902903df73fe4acd9f036bf
parenta2aa0479fc590a42b2167e5748d374f2df29dfad
Removed conflict badge when conflict is solved
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java