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

---
 demo/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/demo/Makefile b/demo/Makefile
index a8b38ff..8fbd78f 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -15,6 +15,7 @@
 
 
 PROGS = dgram_mod_req_rep dgram_mod_survey dgram_mod_bus
+ 
 
 
 build: $(PROGS)

--
Gitblit v1.8.0