@Skif-off pushed 1 commit. 80001e408a26070d3fba6778347e3ef14f050fc7 Fix confl.
-- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/geany/geany/pull/1752/files/d11fcf985025f5c73141a5fa7dbae6f69a343153..80001e408a26070d3fba6778347e3ef14f050fc7
