fredster33 commented on pull request #291: URL: https://github.com/apache/apisix-ingress-controller/pull/291#issuecomment-796938156
> @fredster33 There are conflicting files Hmm, it seems like somebody else edited the README after my change. How could this be resolved? ---------------------------------------------------------------- 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: us...@infra.apache.org