captainzmc edited a comment on pull request #1447: URL: https://github.com/apache/hadoop-ozone/pull/1447#issuecomment-702161601
Thanks for @adoroszlai 's reminding. I have solved the conflict. This PR can continue to be reviewed. ---------------------------------------------------------------- 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 --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-issues-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-issues-h...@hadoop.apache.org