From 5d0308e79a5dff5b040504a17c6300bafdeb1499 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 30 十月 2020 09:36:41 +0800
Subject: [PATCH] fix conflict

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

diff --git a/test_socket/Makefile b/test_socket/Makefile
index 22a401f..1f1d220 100644
--- a/test_socket/Makefile
+++ b/test_socket/Makefile
@@ -1,4 +1,3 @@
-
 ROOT := ..
 PLATFORM=$(shell $(ROOT)/systype.sh)
 include $(ROOT)/Make.defines.$(PLATFORM)

--
Gitblit v1.8.0