@elextr the only conflict is about the API version increment. I thought it was generally practice that this kind of conflict is handled upon merge (since otherwise PRs have to be constantly updated against API version changes)
-- 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-329778640
