<p>rebased to resolve conflicts from <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="420960616" data-permission-text="Issue title is private" data-url="https://github.com/RIOT-OS/RIOT/issues/11181" data-hovercard-type="pull_request" data-hovercard-url="/RIOT-OS/RIOT/pull/11181/hovercard" href="https://github.com/RIOT-OS/RIOT/pull/11181">#11181</a></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/RIOT-OS/RIOT/pull/11201#issuecomment-473979391">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AEn7YMkkrrR4KzGlJbazNA3QLsoILpqQks5vX7mggaJpZM4b5fT5">mute the thread</a>.<img src="https://github.com/notifications/beacon/AEn7YE8rFfLHwSKS5-CaSr9HhxlkH8j0ks5vX7mggaJpZM4b5fT5.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/RIOT-OS/RIOT","title":"RIOT-OS/RIOT","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/RIOT-OS/RIOT"}},"updates":{"snippets":[{"icon":"PERSON","message":"@danpetry in #11201: rebased to resolve conflicts from https://github.com/RIOT-OS/RIOT/pull/11181"}],"action":{"name":"View Pull Request","url":"https://github.com/RIOT-OS/RIOT/pull/11201#issuecomment-473979391"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/RIOT-OS/RIOT/pull/11201#issuecomment-473979391",
"url": "https://github.com/RIOT-OS/RIOT/pull/11201#issuecomment-473979391",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>