From b147f5f7ae955678d216fb3ba2ff8c4c212a16a6 Mon Sep 17 00:00:00 2001
From: xiongraorao <xiongraorao@gmail.com>
Date: Wed, 8 Aug 2018 08:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 60e0fba5..cfcaa569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .DS_Store
-<<<<<<< HEAD
 
 # idea
 code/.idea
@@ -15,6 +14,4 @@ code/out
 # gradle
 code/.gradle
 !code/gradle/wrapper/gradle-wrapper.jar
-=======
 *.txt
->>>>>>> 4770ba68eceb376456a49d8e08f5e74780bbda20