It would be good if you could fix the merge conflict as well.

---
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/858#issuecomment-170292803

Reply via email to