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 | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/test/test.c b/test/test.c
new file mode 100644
index 0000000..b978ef2
--- /dev/null
+++ b/test/test.c
@@ -0,0 +1,5 @@
+#include "usg_common.h"
+#include "usg_typedef.h"
+
+int main() {
+}
\ No newline at end of file
--
Gitblit v1.8.0