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

diff --git a/test/Makefile b/test/Makefile
index ffc7b16..7298905 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -15,6 +15,7 @@
 
  
 PROGS = protocle_parse strtok test_set test_vector lambda test
+ 
 
 build: $(PROGS)
 

--
Gitblit v1.8.0