From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict

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

diff --git a/Makefile b/Makefile
index 18a1a54..b4fa973 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-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