From d9b8d312256e5444741b1e3f75389182b09f4ddb Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 9 Jul 2014 10:02:56 +0900
Subject: [PATCH] =?UTF-8?q?gitignore=20=EC=B6=A9=EB=8F=8C=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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 e56ab3687..52c882a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,4 @@ cheditor*/
 ckeditor43/
 log/
 g5_tree/
-<<<<<<< HEAD
-=======
 naver*.html
->>>>>>> g5