wandoubaba/knowledge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Aaron Chen 2021-12-21 09:32:53 +08:00
parent e054c1fa88
commit 1d91fa94e5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freeswitch/安装freeswitch1.10.md
View File

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