After resolving the merge conflict, I think we are good to merge.

Done. For merging, I'd just squash the commits into one.


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <geany/geany/pull/3977/c2486875696@github.com>