matthiasblaesing commented on PR #5609: URL: https://github.com/apache/netbeans/pull/5609#issuecomment-1476875436
@jtulach the conflict is caused by overlapping changed from #5652. I put my words to work and cleaned the flags up. I suggest to remove the conflicting parts from 0112550f0a792fc6cfe0f26d74defc057a6d5cd0 and rebase this whole PR onto current master. That should clean this up. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
