From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict

---
 Make.common.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Make.common.inc b/Make.common.inc
new file mode 100644
index 0000000..e1d16c3
--- /dev/null
+++ b/Make.common.inc
@@ -0,0 +1,2 @@
+$(LIBCOMMON):
+	(cd $(ROOT)/common && $(MAKE))

--
Gitblit v1.8.0