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

[niyid]

@ripcurlx @sqrrm 

The conficts I am seeing above seem to be transient or recently occurring. For instance in the case of **`bisq.desktop.main.account.AccountView`** refer to the screenshots below: one screen shows the same class file in Green in the PR diff page while the "Resolve conflicts" button shows recent addition of package imports.

-- 
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-532301594
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190917/df0ab98b/attachment.html>