合并冲突

2021-12-21 09:32:53 +08:00 · 2021-12-21 09:32:53 +08:00 · 1d91fa94e5
commit 1d91fa94e5
parent e054c1fa88
1 changed files with 6 additions and 0 deletions
--- a/freeswitch/安装freeswitch1.10.md
+++ b/freeswitch/安装freeswitch1.10.md
@ -44,7 +44,13 @@ gmake install

 # 安装libatomic
 yum install -y libatomic
+<<<<<<< HEAD
 yum install -y uuid-devel libuuid-devel
+=======
+# 安装uuid
+yum install -y uuid-devel libuuid-devel
+
+>>>>>>> f29b6cb (fs1.10安装补充)
 # 单独下载libks源码（需要cmake 3.7.2以上版本）
 cd /usr/local/src
 git clone https://github.com/signalwire/libks.git