I rebased and imply removed the API bump that was causing the conflict. I hope that's what you wanted?
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1445#issuecomment-443462293