From 393c7b5b0ca6c4ceb71ba44621f92da01782e8f1 Mon Sep 17 00:00:00 2001
From: Yujian Zhu <firmlyzhu@163.com>
Date: Sat, 22 Dec 2018 15:49:53 +0800
Subject: [PATCH] fix conflict

---
 prepare.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prepare.sh b/prepare.sh
index 367cbf7..3aa80e9 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -22,7 +22,8 @@ apt-get install -y python3-requests python3-suds
 apt-get install -y nodejs nodejs-legacy npm
 apt-get install -y etcd
 apt-get install -y glusterfs-client attr
-apt-get install -y nginx gdebi-core
+apt-get install -y nginx
+apt-get install -y gdebi-core
 gdebi ossfs_1.80.5_ubuntu16.04_amd64.deb
 pip3 install grpcio grpcio-tools googleapis-common-protos