From 466e9fa9c6bfbc7aca54e66aa891ece034885403 Mon Sep 17 00:00:00 2001
From: Rhio Kim <rhio.kim@gmail.com>
Date: Tue, 18 Apr 2017 15:27:36 +0900
Subject: [PATCH] chore: remove confliction typo

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

diff --git a/.gitignore b/.gitignore
index b41c6fd..692f14e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,12 +17,6 @@ v8.log
 
 # flowtype
 flow-typed/npm
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 # nyc (istanbul cli)
 .nyc_output
-=======
->>>>>>> 3d360aaa494d1622171461e9190606d8727fb563
-=======
->>>>>>> 3d360aaa494d1622171461e9190606d8727fb563