From 13dd278fe0f53c4347a3133d505394144f31bb60 Mon Sep 17 00:00:00 2001
From: liwen <lwdillon@163.com>
Date: Wed, 28 Oct 2020 16:39:03 +0800
Subject: [PATCH] init

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 05f0b38..cfdb9c5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
-#ipsm-sced
-=======
+
 # fx-falsework
 基于javafx、spring boot 开发的客户端与服务端系统开发脚手架
->>>>>>> 81a2173cfca6f001994b84cf6f6997432fea415d
+