From 73c4fa813ca5dba5724b2de2102f314d52baccd6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 30 七月 2020 10:06:31 +0800
Subject: [PATCH] fix conflict

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

diff --git a/test_socket/Makefile b/test_socket/Makefile
index dd1d80f..0c155b1 100644
--- a/test_socket/Makefile
+++ b/test_socket/Makefile
@@ -14,7 +14,7 @@
 include $(ROOT)/Make.defines.$(PLATFORM)
 
 
-PROGS =	dgram_socket_test dgram_mod_req_rep dgram_mod_survey
+PROGS =	dgram_mod_bus dgram_mod_survey dgram_mod_req_rep
 
 
 build: $(PROGS)

--
Gitblit v1.8.0