From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict
---
test/test.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/test/test.c b/test/test.c
index d1193a6..b978ef2 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,7 +1,5 @@
#include "usg_common.h"
#include "usg_typedef.h"
-
int main() {
-}
-
\ No newline at end of file
+}
\ No newline at end of file
--
Gitblit v1.8.0