<p><a href="https://github.com/chimp1984" class="user-mention">@chimp1984</a> pushed 2 commits.</p>

<ul>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq/commit/25c4b4d0fc9fbcd2cb8d1b865cb4c639815c642d">25c4b4d</a>  Merge branch 'master_upstream' into dispute-agent-branch</li>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq/commit/423cc7134ed7e85d36a314a30f741074ca5a57f9">423cc71</a>  Add changes from merge conflict (class was renamed)</li>
</ul>


<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br /><a href="https://github.com/bisq-network/bisq/pull/4543/files/8ac468d84f41ea125b415be080b0c62fd3f867fc..423cc7134ed7e85d36a314a30f741074ca5a57f9">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNXMYBKAMH24BOG4J6LSHTZLXANCNFSM4RUBYJWQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNVXLJ77DXRTIKGJMSLSHTZLXA5CNFSM4RUBYJW2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGQ4TAMBSGE3TSMKQOVZWQIZVG42TENRVGYZDOMA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/4543/files/8ac468d84f41ea125b415be080b0c62fd3f867fc..423cc7134ed7e85d36a314a30f741074ca5a57f9",
"url": "https://github.com/bisq-network/bisq/pull/4543/files/8ac468d84f41ea125b415be080b0c62fd3f867fc..423cc7134ed7e85d36a314a30f741074ca5a57f9",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>