zrhoffman commented on pull request #4724: URL: https://github.com/apache/trafficcontrol/pull/4724#issuecomment-640955437
Rebased to resolve merge conflicts. As @rawlinp [noted](/apache/trafficcontrol/pull/4765#issuecomment-640947401), no code needed to be changed, all it took was deleting a couple of empty conflict sections in Node.java. ---------------------------------------------------------------- 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]
