From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict

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

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

--
Gitblit v1.8.0