<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=1509322" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/BrannonKing">@BrannonKing</a> Please resolve the conflict with Asset (probably because of another merged asset PR)</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/3407?email_source=notifications&email_token=AJFFTNW3RQXTGT4X3NF5TDDQPFWJFA5CNFSM4JAW4ZA2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBTITYA#issuecomment-543590880">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQEQ6NPIXSM3HMOT5TQPFWJFANCNFSM4JAW4ZAQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNVDF6IGOJUR4XXQP2TQPFWJFA5CNFSM4JAW4ZA2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBTITYA.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/3407?email_source=notifications\u0026email_token=AJFFTNW3RQXTGT4X3NF5TDDQPFWJFA5CNFSM4JAW4ZA2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBTITYA#issuecomment-543590880",
"url": "https://github.com/bisq-network/bisq/pull/3407?email_source=notifications\u0026email_token=AJFFTNW3RQXTGT4X3NF5TDDQPFWJFA5CNFSM4JAW4ZA2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBTITYA#issuecomment-543590880",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>