From e6a24220295d534ea49c2c71d1d0420161e77ac4 Mon Sep 17 00:00:00 2001
From: "webb.wang" <weiwei.wang.01@redcore.cn>
Date: Tue, 6 Nov 2018 15:31:44 +0800
Subject: [PATCH] fix conflicts

---
 c | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 c

diff --git a/c b/c
new file mode 100644
index 0000000..3cf068a
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+fix conflicts