<p>Hi Tobias, I tried the resolve thru github which is a bit scary but OK for such simple change.<br>
The sole conflict was your own change of a tab to spaces...</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/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450502793">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AhLyW_hTW53SC-oZoI7Th0eWkqF-1HcOks5u95NsgaJpZM4Sl0aO">mute the thread</a>.<img src="https://github.com/notifications/beacon/AhLyW26iztUZ26N8teWAi5jCsL5iQKD3ks5u95NsgaJpZM4Sl0aO.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/OpenSmalltalk/opensmalltalk-vm","title":"OpenSmalltalk/opensmalltalk-vm","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/OpenSmalltalk/opensmalltalk-vm"}},"updates":{"snippets":[{"icon":"PERSON","message":"@nicolas-cellier-aka-nice in #227: Hi Tobias, I tried the resolve thru github which is a bit scary but OK for such simple change.\r\nThe sole conflict was your own change of a tab to spaces..."}],"action":{"name":"View Pull Request","url":"https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450502793"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450502793",
"url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450502793",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>