@ankitpati though the conflict is trivial, might as well fix it, the less for committers to do the more likely it will happen.
LGBI -- 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/1323#issuecomment-269423612
