From a1d63ffe480938a7fed5947c3f72b54bdcfffa51 Mon Sep 17 00:00:00 2001
From: chenpeng15 <m17301027296@163.com>
Date: Tue, 26 Sep 2017 20:57:36 +0800
Subject: [PATCH] for test

---
 新建文本文档.txt | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 新建文本文档.txt

diff --git a/新建文本文档.txt b/新建文本文档.txt
deleted file mode 100644
index 1e2f19f..0000000
--- a/新建文本文档.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-ssssss
-=======
-ssss
->>>>>>> remotes/origin/devolpe_cp