From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 21 Aug 2015 09:35:04 +0000 (+0200)
Subject: Removed conflict badge when conflict is solved
X-Git-Tag: oc-android-1.9^2~37^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7399508e050d9a2bf5a44188b6abc46501b19357?ds=inline;hp=7399508e050d9a2bf5a44188b6abc46501b19357

Removed conflict badge when conflict is solved
---