<p><a class="user-mention" data-hovercard-user-id="20751055" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/buckshee">@buckshee</a> fix conflicts and squash commits into single one.</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-assets/pull/10#issuecomment-390574973">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtgKe5mCP6QFh3oq5UL67pjpcN55Qks5t0mvWgaJpZM4T8j9K">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZthAsWEkTntlWkZYt4VzbCn76wMGkks5t0mvWgaJpZM4T8j9K.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-assets/pull/10#issuecomment-390574973","url":"https://github.com/bisq-network/bisq-assets/pull/10#issuecomment-390574973","name":"View Pull Request"},"description":"View this Pull Request on GitHub","publisher":{"@type":"Organization","name":"GitHub","url":"https://github.com"}}</script>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq-assets","title":"bisq-network/bisq-assets","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq-assets"}},"updates":{"snippets":[{"icon":"PERSON","message":"@blabno in #10: @buckshee fix conflicts and squash commits into single one."}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq-assets/pull/10#issuecomment-390574973"}}}</script>
<script type="application/ld+json">{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "37567f93-e2a7-4e2a-ad37-a9160fc62647",
"title": "Re: [bisq-network/bisq-assets] List MaxCoin (MAX) (#10)",
"sections": [
{
"text": "",
"activityTitle": "**Bernard Labno**",
"activityImage": "https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png",
"activitySubtitle": "@blabno",
"facts": [

]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"bisq-network/bisq-assets\",\n\"issueId\": 10,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"bisq-network/bisq-assets\",\n\"pullRequestId\": 10\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq-assets/pull/10#issuecomment-390574973"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 334643018\n}"
}
],
"themeColor": "26292E"
}</script>