You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2021/02/17 17:47:33 UTC

[GitHub] [netbeans] entlicher commented on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

entlicher commented on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780731772


   The two files needs to be merged and not replaced. If this is merged as it is, I can follow-up with a PR that merges these two files.


----------------------------------------------------------------
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.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists