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

<ul>
  <li><a class="commit-link" href="https://github.com/bisq-network/bisq/commit/07a8753798ce97deb24c500f1cb16a4842c2daca">07a8753</a>  Fixed merge conficts in displayStrings.properties</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/2281/files/ecb09e08ae0cf9989e3a1c94f18ed3c271188239..07a8753798ce97deb24c500f1cb16a4842c2daca">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtuQst_65H3xakf90sl6dyenBYNyIks5vGJjggaJpZM4aG3fy">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtrDgY8HYybomas9rvljiKu8UpSwoks5vGJjggaJpZM4aG3fy.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","subtitle":"GitHub repository","main_image_url":"https://github.githubassets.com/images/email/message_cards/header.png","avatar_image_url":"https://github.githubassets.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq"}},"updates":{"snippets":[{"icon":"PERSON","message":"@aphivantrakul pushed 1 commit in #2281"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2281/files/ecb09e08ae0cf9989e3a1c94f18ed3c271188239..07a8753798ce97deb24c500f1cb16a4842c2daca"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2281/files/ecb09e08ae0cf9989e3a1c94f18ed3c271188239..07a8753798ce97deb24c500f1cb16a4842c2daca",
"url": "https://github.com/bisq-network/bisq/pull/2281/files/ecb09e08ae0cf9989e3a1c94f18ed3c271188239..07a8753798ce97deb24c500f1cb16a4842c2daca",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>