<p><a href="https://github.com/jmacxx" class="user-mention">@jmacxx</a> pushed 1 commit.</p>

<ul>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq/commit/35312273f1515effbb2eeb13b3f41ff96ae819bf">3531227</a>  resolve conflict with PR #5178</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/5160/files/e32fdd924b67fd73d38b5d0ece09189beaac69ab..35312273f1515effbb2eeb13b3f41ff96ae819bf">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQ25Z2WBFRNUXABHBLS7COKDANCNFSM4XGTWFMQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNQ2S3KUNV5UZAFAKC3S7COKDA5CNFSM4XGTWFM2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGU3DQOBUGQ4TON2QOVZWQIZWGUZTEMJXGE4TEMA.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/5160/files/e32fdd924b67fd73d38b5d0ece09189beaac69ab..35312273f1515effbb2eeb13b3f41ff96ae819bf",
"url": "https://github.com/bisq-network/bisq/pull/5160/files/e32fdd924b67fd73d38b5d0ece09189beaac69ab..35312273f1515effbb2eeb13b3f41ff96ae819bf",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>