From: Sven Hoexter Date: Mon, 9 Nov 2015 19:44:33 +0000 (+0100) Subject: resolve delta conflict X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=29ac3e86afe52574ce43aaa6b7ae37e438c63a1d;hp=-c;p=sven%2Fexfat-utils.git resolve delta conflict --- 29ac3e86afe52574ce43aaa6b7ae37e438c63a1d