This is an automated email from the ASF dual-hosted git repository. vongosling pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-docker.git
commit 30cc04eee1c84757bb6b72d9b5a1e1d0eabd113f Merge: bd1d731 c40ccce Author: von gosling <vongosl...@apache.org> AuthorDate: Fri Nov 8 16:35:14 2019 +0800 fix(conflict): fix the path conflict problem README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)