ebresie commented on pull request #2622: URL: https://github.com/apache/netbeans/pull/2622#issuecomment-812882345
How do I handle the resolve these conflicting files? I don't beleive these were ever intended to be included in this python push -- 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: [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
