Yes. I had postponed the task for today.<br>
<br>
On 2/3/20, Christoph Atteneder <notifications@github.com> wrote:<br>
> @dmos62 Could you please resolve the conflict and I'll review your PR again<br>
> for v1.2.6.<br>
><br>
> --<br>
> You are receiving this because you were mentioned.<br>
> Reply to this email directly or view it on GitHub:<br>
> https://github.com/bisq-network/bisq/pull/3910#issuecomment-581374742<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/3910?email_source=notifications&email_token=AJFFTNUAXYVSQTCLUTJBBZLRBABLRA5CNFSM4KJTKWS2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEKTSUWQ#issuecomment-581380698">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTLVX64UMKWJLSK2PDRBABLRANCNFSM4KJTKWSQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNRFECDP6GXL3MFI6F3RBABLRA5CNFSM4KJTKWS2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEKTSUWQ.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/3910?email_source=notifications\u0026email_token=AJFFTNUAXYVSQTCLUTJBBZLRBABLRA5CNFSM4KJTKWS2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEKTSUWQ#issuecomment-581380698",
"url": "https://github.com/bisq-network/bisq/pull/3910?email_source=notifications\u0026email_token=AJFFTNUAXYVSQTCLUTJBBZLRBABLRA5CNFSM4KJTKWS2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEKTSUWQ#issuecomment-581380698",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>