From 5d0308e79a5dff5b040504a17c6300bafdeb1499 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 30 十月 2020 09:36:41 +0800
Subject: [PATCH] fix conflict

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

diff --git a/Makefile b/Makefile
index f55f829..d471709 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # debug "make --just-print"
-DIRS = src test_net_socket
+DIRS = src test_net_socket test_socket
 TAR_NAME = shm_queue.tar.gz
 
 all:

--
Gitblit v1.8.0