]> git.sven.stormbind.net Git - sven/exfat-utils.git/commitdiff
resolve delta conflict
authorSven Hoexter <sven@stormbind.net>
Mon, 9 Nov 2015 19:44:33 +0000 (20:44 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 9 Nov 2015 19:44:33 +0000 (20:44 +0100)

Trivial merge