<p>Please rebase this branch against current master, or resolve the conflicts with it, so that it is cleanly mergeable. Not only will this allow the automated tests to run, but also means that review can start. Thanks!</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/openstreetmap/openstreetmap-website/pull/1268#issuecomment-239689490">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLeOBLD5UTAsvoTl8hamNwRwwyA7Kks5qf2LTgaJpZM4Jj6LN">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLYSB8UiZM5YAcXrTu4M4VsUn4BdPks5qf2LTgaJpZM4Jj6LN.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/openstreetmap/openstreetmap-website/pull/1268#issuecomment-239689490"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","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/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"PERSON","message":"@zerebubuth in #1268: Please rebase this branch against current master, or resolve the conflicts with it, so that it is cleanly mergeable. Not only will this allow the automated tests to run, but also means that review can start. Thanks!"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1268#issuecomment-239689490"}}}</script>