<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=1449498" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/ManfredKarrer">@ManfredKarrer</a> I just rebased from master to resolve merge conflicts that showed up after you merged <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="422889119" data-permission-text="Issue title is private" data-url="https://github.com/bisq-network/bisq/issues/2563" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/2563/hovercard" href="https://github.com/bisq-network/bisq/pull/2563">#2563</a></p>
<p>PR is ready to be merged.</p>

<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/2564#issuecomment-474565235">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtnoJAaCVijlxdWlqqCfYV0NvSKMKks5vYUbAgaJpZM4b823t">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtv-yzGFIDr1zfqY_IcsnuTA7s-dhks5vYUbAgaJpZM4b823t.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":"@oscarguindzberg in #2564: @ManfredKarrer I just rebased from master to resolve merge conflicts that showed up after you merged #2563 \r\n\r\nPR is ready to be merged."}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2564#issuecomment-474565235"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2564#issuecomment-474565235",
"url": "https://github.com/bisq-network/bisq/pull/2564#issuecomment-474565235",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>