From 80ecfcbc4367568abd5d860a2473653638e44e10 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 14 七月 2020 10:42:11 +0800
Subject: [PATCH] commit

---
 .gitignore |    8 ++++++++
 README.md  |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2d51ac..31c642f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,14 @@
 # Compiled Static libraries
 *.lai
 *.la
+# Compiled Dynamic libraries
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.lai
+*.la
+*.lib
 
 # Executables
 *.exe
diff --git a/README.md b/README.md
index 97e5fce..4193faf 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 瀹炰緥
 
 ```
@@ -112,4 +113,9 @@
 int shmqueue_pop_timeout(void *shmqueue, void *dest_ele, struct timespec * timeout);
 
 ```
+=======
+## softbus
+
+shm鐨勯�氳搴�
+>>>>>>> dd08a8134dea74ac30213c1b8580bff34ee7095b
 

--
Gitblit v1.8.0