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/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 4b888f5..7298905 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,8 @@
 include $(ROOT)/Make.defines.$(PLATFORM)
 
  
-PROGS = protocle_parse test
+PROGS = protocle_parse strtok test_set test_vector lambda test
+ 
 
 build: $(PROGS)
 

--
Gitblit v1.8.0