@aferust: I can resolve the conflicts if you like because they come from my PR #864. Doing that will change your PR and branch ```aferust:master```.
-- 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-plugins/pull/789#issuecomment-510903822
