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

<ul>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq/commit/623a1db1e765aad02200008102c5e548d7bdd363">623a1db</a>  Fix merge conflict</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/3052/files/2709e618755f761bbeb44afe20ea4716c9d889cc..623a1db1e765aad02200008102c5e548d7bdd363?email_source=notifications&email_token=AJFFTNVGFVLGDZ554YIAJ6TQDWVABA5CNFSM4IJDWDW2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGMYDIMBRHE4TCMKQOVZWQIZTHEYDQNZYHA3DSOA">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNRYYBX7NWBELRWGFNDQDWVABANCNFSM4IJDWDWQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNVVRVAQSIL3BKZ7NS3QDWVABA5CNFSM4IJDWDW2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGMYDIMBRHE4TCMKQOVZWQIZTHEYDQNZYHA3DSOA.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/3052/files/2709e618755f761bbeb44afe20ea4716c9d889cc..623a1db1e765aad02200008102c5e548d7bdd363?email_source=notifications\u0026email_token=AJFFTNVGFVLGDZ554YIAJ6TQDWVABA5CNFSM4IJDWDW2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGMYDIMBRHE4TCMKQOVZWQIZTHEYDQNZYHA3DSOA",
"url": "https://github.com/bisq-network/bisq/pull/3052/files/2709e618755f761bbeb44afe20ea4716c9d889cc..623a1db1e765aad02200008102c5e548d7bdd363?email_source=notifications\u0026email_token=AJFFTNVGFVLGDZ554YIAJ6TQDWVABA5CNFSM4IJDWDW2YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGMYDIMBRHE4TCMKQOVZWQIZTHEYDQNZYHA3DSOA",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>