Fixed minor `doc/geany.txt` conflict, rebased and pushed to `geany/build-exec`.
-- 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/2307#issuecomment-538641780
