You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/02/10 01:11:15 UTC
[apisix] branch master updated: docs: fix unresolved merge
conflicts (#3570)
This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 8476139 docs: fix unresolved merge conflicts (#3570)
8476139 is described below
commit 84761392cdbba0f5bc2cbb0ecdfcdc5ba5b00b9f
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Wed Feb 10 09:11:04 2021 +0800
docs: fix unresolved merge conflicts (#3570)
Signed-off-by: spacewander <sp...@gmail.com>
---
doc/zh-cn/install-dependencies.md | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/doc/zh-cn/install-dependencies.md b/doc/zh-cn/install-dependencies.md
index f5f98f0..8e986c9 100644
--- a/doc/zh-cn/install-dependencies.md
+++ b/doc/zh-cn/install-dependencies.md
@@ -78,11 +78,7 @@ tar -xvf etcd-v3.4.13-linux-amd64.tar.gz && \
sudo yum install -y openresty curl git gcc openresty-openssl-devel
# 安装 LuaRocks
-<<<<<<< HEAD
-curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | sudo bash -
-=======
curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | bash -
->>>>>>> master
# 开启 etcd server
nohup etcd &
@@ -108,11 +104,7 @@ tar -xvf etcd-v3.4.13-linux-amd64.tar.gz && \
sudo apt-get install -y git openresty curl openresty-openssl-dev
# 安装 LuaRocks
-<<<<<<< HEAD
-curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | sudo bash -
-=======
curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | bash -
->>>>>>> master
# 开启 etcd server
nohup etcd &
@@ -143,11 +135,7 @@ tar -xvf etcd-v3.4.13-linux-amd64.tar.gz && \
sudo apt-get install -y git openresty curl make openresty-openssl-dev
# 安装 LuaRocks
-<<<<<<< HEAD
-curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | sudo bash -
-=======
curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | bash -
->>>>>>> master
# 开启 etcd server
nohup etcd &