From 1d91fa94e5e05b30dc3a67bd6c869b8af0ee2db3 Mon Sep 17 00:00:00 2001
From: Aaron Chen <wandoubaba517@gmail.com>
Date: Tue, 21 Dec 2021 09:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 freeswitch/安装freeswitch1.10.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/freeswitch/安装freeswitch1.10.md b/freeswitch/安装freeswitch1.10.md
index d1fe15e..eca58e8 100644
--- 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