[bisq-network/bisq] Fulfilling Proposal #110 (#3275)

[erciccione]

@niyid Yes, those conflicts happened because your PR touches files that have been changed with the recent merges.
My suggestion is to use `git pull upstream master --rebase`, so that you will be able to manually fix all conflicts.

-- 
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/3275#issuecomment-532332900
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190917/1b8104e1/attachment.html>