From e557fcb8e3976762af846b58188d7a24523879c4 Mon Sep 17 00:00:00 2001
From: sentsin <xu@sentsin.com>
Date: Mon, 20 Apr 2015 00:57:51 +0800
Subject: [PATCH] conflict

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 863db58..3a4bb80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,6 @@ Thumbs.db
 .settings/
 node_modules/
 _site/
+.gitignore
 
 git/
\ No newline at end of file