<p><a href="https://github.com/getzze" class="user-mention">@getzze</a> pushed 4 commits.</p>

<ul>
  <li><a class="commit-link" href="https://github.com/geany/geany/commit/6400fe99fc439a48001b614bc27d2109e772f102">6400fe9</a>  correct scintilla warnings</li>
  <li><a class="commit-link" href="https://github.com/geany/geany/commit/613d38bad18b36f6bbb2267642b40b2dcfabeb0e">613d38b</a>  merge conflict</li>
  <li><a class="commit-link" href="https://github.com/geany/geany/commit/8f9e59f14786d2ef5c135b768b18092c8edf2125">8f9e59f</a>  merge conflict</li>
  <li><a class="commit-link" href="https://github.com/geany/geany/commit/31bede9a57915916e1066d380925f0fef3677680">31bede9</a>  merge conflict</li>
</ul>


<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 /><a href="https://github.com/geany/geany/pull/2584/files/10cd4a645adbd33cb271b2d832342aeb6acc2d4b..31bede9a57915916e1066d380925f0fef3677680">View it on GitHub</a> or <a href="https://github.com/notifications/unsubscribe-auth/AAIOWJ6IMHYUKCFYY6R4CADTOT2NXANCNFSM4RIBU6VA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AAIOWJZXSOKJVXBNE6KX3WTTOT2NXA5CNFSM4RIBU6VKYY3PNVWWK3TUL52HS4DFXNIHK3DMKJSXC5LFON2FA5LTNBHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZF5KB2WY3BDGQ4DKMZTGYYDCM2QOVZWQIZXGE2TKNJZGQZDQOA.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/pull/2584/files/10cd4a645adbd33cb271b2d832342aeb6acc2d4b..31bede9a57915916e1066d380925f0fef3677680",
"url": "https://github.com/geany/geany/pull/2584/files/10cd4a645adbd33cb271b2d832342aeb6acc2d4b..31bede9a57915916e1066d380925f0fef3677680",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>