conflict

2015-04-20 00:56:28 +08:00 · 2015-04-20 00:56:28 +08:00 · e0e14129fe
parent d88519f482
commit e0e14129fe
18 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,5 +17,5 @@ Thumbs.db
 .settings/
 node_modules/
 _site/
-*/seaning
+
 git/
--- a/src/skin/seaning/close.png
+++ b/src/skin/seaning/close.png
--- a/src/skin/seaning/default.png
+++ b/src/skin/seaning/default.png
--- a/src/skin/seaning/icon0.png
+++ b/src/skin/seaning/icon0.png
--- a/src/skin/seaning/icon1.png
+++ b/src/skin/seaning/icon1.png
--- a/src/skin/seaning/icon10.png
+++ b/src/skin/seaning/icon10.png
--- a/src/skin/seaning/icon11.png
+++ b/src/skin/seaning/icon11.png
--- a/src/skin/seaning/icon12.png
+++ b/src/skin/seaning/icon12.png
--- a/src/skin/seaning/icon13.png
+++ b/src/skin/seaning/icon13.png
--- a/src/skin/seaning/icon2.png
+++ b/src/skin/seaning/icon2.png
--- a/src/skin/seaning/icon3.png
+++ b/src/skin/seaning/icon3.png
--- a/src/skin/seaning/icon4.png
+++ b/src/skin/seaning/icon4.png
--- a/src/skin/seaning/icon5.png
+++ b/src/skin/seaning/icon5.png
--- a/src/skin/seaning/icon6.png
+++ b/src/skin/seaning/icon6.png
--- a/src/skin/seaning/icon7.png
+++ b/src/skin/seaning/icon7.png
--- a/src/skin/seaning/icon8.png
+++ b/src/skin/seaning/icon8.png
--- a/src/skin/seaning/icon9.png
+++ b/src/skin/seaning/icon9.png
--- a/src/skin/seaning/style.css
+++ b/src/skin/seaning/style.css