From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict

---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 18a1a54..e2c95d6 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
-DIRS = src test_socket demo
+DIRS = src test_socket demo test
 TAR_NAME = shm_queue.tar.gz
+
+ 
 all:
 	for i in $(DIRS); do \
 		(cd $$i && echo "making $$i" && $(MAKE) ) || exit 1; \

--
Gitblit v1.8.0