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

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3a4bb80..5c36580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,6 @@ Thumbs.db
 node_modules/
 _site/
 .gitignore
-
+skin/seaning/
+src/skin/seaning/
 git/
\ No newline at end of file