Will do. Apologies.<br>
<br>
On Tue, Nov 5, 2019, 09:53 Christoph Atteneder <notifications@github.com><br>
wrote:<br>
<br>
> @niyid <https://github.com/niyid> Please resolve conflict with<br>
> displayStrings.properties.<br>
><br>
> —<br>
> You are receiving this because you were mentioned.<br>
> Reply to this email directly, view it on GitHub<br>
> <https://github.com/bisq-network/bisq/pull/3477?email_source=notifications&email_token=AE2MWR6WWJVXEZ32FPYRKP3QSEX7JA5CNFSM4JFLR7BKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCCFDI#issuecomment-549724813>,<br>
> or unsubscribe<br>
> <https://github.com/notifications/unsubscribe-auth/AE2MWR66RDKH2HSWJFJVH5LQSEX7JANCNFSM4JFLR7BA><br>
> .<br>
><br>


<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 />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3477?email_source=notifications&email_token=AJFFTNTMOLUYMXDNNTDDRWDQSFQVZA5CNFSM4JFLR7BKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCUZHY#issuecomment-549801119">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQ543MTDHOPMONAU7TQSFQVZANCNFSM4JFLR7BA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNV5FRK6LLGIJWQJD2LQSFQVZA5CNFSM4JFLR7BKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCUZHY.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/3477?email_source=notifications\u0026email_token=AJFFTNTMOLUYMXDNNTDDRWDQSFQVZA5CNFSM4JFLR7BKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCUZHY#issuecomment-549801119",
"url": "https://github.com/bisq-network/bisq/pull/3477?email_source=notifications\u0026email_token=AJFFTNTMOLUYMXDNNTDDRWDQSFQVZA5CNFSM4JFLR7BKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDCUZHY#issuecomment-549801119",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>