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

<ul>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq-website/commit/8688f91399cfafc2b242528fdaa1cf5696d540cd">8688f91</a>  Remove merge conflict issue</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-website/pull/382/files/cf1eb3c7e2127c08c99b9a167f27b10b4289c125..8688f91399cfafc2b242528fdaa1cf5696d540cd">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQDDZIDSVZ2TETCRBLR7TBN7ANCNFSM4PQ6HV6Q">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNWFZRIID55BQ5LC3J3R7TBN7A5CNFSM4PQ6HV62YY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGQ3DANJUGE2DQMKQOVZWQIZVGQ4TSNJVGE2DKMI.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-website/pull/382/files/cf1eb3c7e2127c08c99b9a167f27b10b4289c125..8688f91399cfafc2b242528fdaa1cf5696d540cd",
"url": "https://github.com/bisq-network/bisq-website/pull/382/files/cf1eb3c7e2127c08c99b9a167f27b10b4289c125..8688f91399cfafc2b242528fdaa1cf5696d540cd",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>