<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=9843449" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/aferust">@aferust</a>: I can resolve the conflicts if you like because they come from my PR <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="445581164" data-permission-text="Issue title is private" data-url="https://github.com/geany/geany-plugins/issues/864" data-hovercard-type="pull_request" data-hovercard-url="/geany/geany-plugins/pull/864/hovercard" href="https://github.com/geany/geany-plugins/pull/864">#864</a>. Doing that will change your PR and branch <code>aferust:master</code>.</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-plugins/pull/789?email_source=notifications&email_token=AAIOWJ2IQFTEXNMSQCXH433P7CHDNA5CNFSM4GDXBHLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZZ4MDQ#issuecomment-510903822">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAIOWJ557LBXBYAKULUOPD3P7CHDNANCNFSM4GDXBHLA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AAIOWJZNS7KLARO6IG3BUXDP7CHDNA5CNFSM4GDXBHLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZZ4MDQ.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/geany/geany-plugins/pull/789?email_source=notifications\u0026email_token=AAIOWJ2IQFTEXNMSQCXH433P7CHDNA5CNFSM4GDXBHLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZZ4MDQ#issuecomment-510903822",
"url": "https://github.com/geany/geany-plugins/pull/789?email_source=notifications\u0026email_token=AAIOWJ2IQFTEXNMSQCXH433P7CHDNA5CNFSM4GDXBHLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZZ4MDQ#issuecomment-510903822",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>