From: David A. Velasco Date: Fri, 21 Aug 2015 12:01:17 +0000 (+0200) Subject: Remove conflict badge from ancestors when conflict is solved there are no more confli... X-Git-Tag: oc-android-1.9^2~37^2~14 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/95bebe9382cd34e3811c1ef00d9e3b9018163328?hp=95bebe9382cd34e3811c1ef00d9e3b9018163328 Remove conflict badge from ancestors when conflict is solved there are no more conflicts below ---