<p>I re-pushed after fixing the conflicts now <a class="user-mention" data-hovercard-user-id="181177" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/codebrainz">@codebrainz</a> committed <a class="commit-link" href="https://github.com/geany/geany/commit/36f44741b5daa67f08c4251c147457b95545ef14"><tt>36f4474</tt></a> (which is basically exactly the commit I had).</p>
<p>I also cherry-picked <a class="commit-link" href="https://github.com/geany/geany/commit/2128bf1be647dfa8f20fd6e00029c9f842e84e77"><tt>2128bf1</tt></a> into master, so the only thing left is the controversial placeholder change.  Closing for now.</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/geany/geany/pull/1554#issuecomment-410454174">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ7MHWLi5enHNQXDTqJ8n4R3sy9mgks5uNbKjgaJpZM4OgvkT">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABDrJ9tZcKegYGQM8i6e0-j5KiaKsLOiks5uNbKjgaJpZM4OgvkT.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/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"PERSON","message":"@b4n in #1554: I re-pushed after fixing the conflicts now @codebrainz committed 36f44741b5daa67f08c4251c147457b95545ef14 (which is basically exactly the commit I had).\r\n\r\nI also cherry-picked 2128bf1be647dfa8f20fd6e00029c9f842e84e77 into master, so the only thing left is the controversial placeholder change.  Closing for now."}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1554#issuecomment-410454174"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/geany/geany/pull/1554#issuecomment-410454174",
"url": "https://github.com/geany/geany/pull/1554#issuecomment-410454174",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Re: [geany/geany] Fixes \u0026 changes for #1470 (#1554)",
"sections": [
{
"text": "",
"activityTitle": "**Colomban Wendling**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@b4n",
"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\": \"geany/geany\",\n\"issueId\": 1554,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/geany/geany/pull/1554#issuecomment-410454174"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 243464467\n}"
}
],
"themeColor": "26292E"
}
]</script>