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

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

diff --git a/test_queue/Makefile b/test_queue/Makefile
index 643b72d..1a3a201 100755
--- a/test_queue/Makefile
+++ b/test_queue/Makefile
@@ -14,7 +14,7 @@
 include $(ROOT)/Make.defines.$(PLATFORM)
 
  
-PROGS = dgram_socket_test
+PROGS = test
 
 build: $(PROGS)
 

--
Gitblit v1.8.0