https://bugs.documentfoundation.org/show_bug.cgi?id=170259
--- Comment #11 from Khaled Hosny <[email protected]> --- (In reply to Neil Patel from comment #10) > I have submitted patch updates. > > https://gerrit.libreoffice.org/c/core/+/202048 > https://gerrit.libreoffice.org/c/core/+/202049 > > The second commit indicates there is a merge conflict but I have rebased a > few times and cannot find the conflict. > > Should I abandon the two patches that I squashed? > > Thanks You can ignore the merge conflict as it is caused by the later change needing to be applied on top of the earlier change, it will go away when the changes are merged. The old changes should be abandoned on Gerrit. -- You are receiving this mail because: You are the assignee for the bug.
