[bisq-network/bisq] Fix issues with DAO full mode in preferences (#2736)

[Christoph Atteneder]

Only conflicts need to be resolved

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/2736#issuecomment-484442712
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190418/40d09661/attachment-0001.html>