<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/1507a2c791294f3e8efaf39f12a62af8f5724f4c">1507a2c</a>  Resolve file conflict w/ master</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/4948/files/4aa4270ed925e59a09608d4ef411408246c0d406..1507a2c791294f3e8efaf39f12a62af8f5724f4c">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNS64HB6S7S6F36PNCTSV6IC3ANCNFSM4U3EQA3A">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNXNUFHVDBIAIYSSTYTSV6IC3A5CNFSM4U3EQA3KYY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGUZTSNZRGIYTAMKQOVZWQIZWGIZTSNZQG42TKNQ.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/4948/files/4aa4270ed925e59a09608d4ef411408246c0d406..1507a2c791294f3e8efaf39f12a62af8f5724f4c",
"url": "https://github.com/bisq-network/bisq/pull/4948/files/4aa4270ed925e59a09608d4ef411408246c0d406..1507a2c791294f3e8efaf39f12a62af8f5724f4c",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>