Remove conflict badge from ancestors when conflict is solved there are no more confli...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Aug 2015 12:01:17 +0000 (14:01 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Sep 2015 13:13:50 +0000 (15:13 +0200)
commit95bebe9382cd34e3811c1ef00d9e3b9018163328
tree5e465f2c063b95d6df1d50b8875b48be55f16554
parent7399508e050d9a2bf5a44188b6abc46501b19357
Remove conflict badge from ancestors when conflict is solved there are no more conflicts below
src/com/owncloud/android/datamodel/FileDataStorageManager.java