> > I just rebased on top of master to fix the merge conflict. I did not > > include my latest suggested change. > > And I'm afraid I just introduced another merge conflict by merging #3547...
No worries, I have it resolved locally and it's not a big deal. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3316#issuecomment-1755246888 You are receiving this because you are subscribed to this thread. Message ID: <geany/geany/pull/3316/c1755246...@github.com>