From 38fa84444dcb8a99058071d61405a92cac7adc7f Mon Sep 17 00:00:00 2001 From: sentsin Date: Mon, 20 Apr 2015 00:59:30 +0800 Subject: [PATCH] conflict --- .gitignore | 3 +-- {skin => src/skin}/seaning/close.png | Bin {skin => src/skin}/seaning/default.png | Bin {skin => src/skin}/seaning/icon0.png | Bin {skin => src/skin}/seaning/icon1.png | Bin {skin => src/skin}/seaning/icon10.png | Bin {skin => src/skin}/seaning/icon11.png | Bin {skin => src/skin}/seaning/icon12.png | Bin {skin => src/skin}/seaning/icon13.png | Bin {skin => src/skin}/seaning/icon2.png | Bin {skin => src/skin}/seaning/icon3.png | Bin {skin => src/skin}/seaning/icon4.png | Bin {skin => src/skin}/seaning/icon5.png | Bin {skin => src/skin}/seaning/icon6.png | Bin {skin => src/skin}/seaning/icon7.png | Bin {skin => src/skin}/seaning/icon8.png | Bin {skin => src/skin}/seaning/icon9.png | Bin {skin => src/skin}/seaning/style.css | 0 18 files changed, 1 insertion(+), 2 deletions(-) rename {skin => src/skin}/seaning/close.png (100%) rename {skin => src/skin}/seaning/default.png (100%) rename {skin => src/skin}/seaning/icon0.png (100%) rename {skin => src/skin}/seaning/icon1.png (100%) rename {skin => src/skin}/seaning/icon10.png (100%) rename {skin => src/skin}/seaning/icon11.png (100%) rename {skin => src/skin}/seaning/icon12.png (100%) rename {skin => src/skin}/seaning/icon13.png (100%) rename {skin => src/skin}/seaning/icon2.png (100%) rename {skin => src/skin}/seaning/icon3.png (100%) rename {skin => src/skin}/seaning/icon4.png (100%) rename {skin => src/skin}/seaning/icon5.png (100%) rename {skin => src/skin}/seaning/icon6.png (100%) rename {skin => src/skin}/seaning/icon7.png (100%) rename {skin => src/skin}/seaning/icon8.png (100%) rename {skin => src/skin}/seaning/icon9.png (100%) rename {skin => src/skin}/seaning/style.css (100%) diff --git a/.gitignore b/.gitignore index 5c36580..3a4bb80 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,5 @@ Thumbs.db node_modules/ _site/ .gitignore -skin/seaning/ -src/skin/seaning/ + git/ \ No newline at end of file diff --git a/skin/seaning/close.png b/src/skin/seaning/close.png similarity index 100% rename from skin/seaning/close.png rename to src/skin/seaning/close.png diff --git a/skin/seaning/default.png b/src/skin/seaning/default.png similarity index 100% rename from skin/seaning/default.png rename to src/skin/seaning/default.png diff --git a/skin/seaning/icon0.png b/src/skin/seaning/icon0.png similarity index 100% rename from skin/seaning/icon0.png rename to src/skin/seaning/icon0.png diff --git a/skin/seaning/icon1.png b/src/skin/seaning/icon1.png similarity index 100% rename from skin/seaning/icon1.png rename to src/skin/seaning/icon1.png diff --git a/skin/seaning/icon10.png b/src/skin/seaning/icon10.png similarity index 100% rename from skin/seaning/icon10.png rename to src/skin/seaning/icon10.png diff --git a/skin/seaning/icon11.png b/src/skin/seaning/icon11.png similarity index 100% rename from skin/seaning/icon11.png rename to src/skin/seaning/icon11.png diff --git a/skin/seaning/icon12.png b/src/skin/seaning/icon12.png similarity index 100% rename from skin/seaning/icon12.png rename to src/skin/seaning/icon12.png diff --git a/skin/seaning/icon13.png b/src/skin/seaning/icon13.png similarity index 100% rename from skin/seaning/icon13.png rename to src/skin/seaning/icon13.png diff --git a/skin/seaning/icon2.png b/src/skin/seaning/icon2.png similarity index 100% rename from skin/seaning/icon2.png rename to src/skin/seaning/icon2.png diff --git a/skin/seaning/icon3.png b/src/skin/seaning/icon3.png similarity index 100% rename from skin/seaning/icon3.png rename to src/skin/seaning/icon3.png diff --git a/skin/seaning/icon4.png b/src/skin/seaning/icon4.png similarity index 100% rename from skin/seaning/icon4.png rename to src/skin/seaning/icon4.png diff --git a/skin/seaning/icon5.png b/src/skin/seaning/icon5.png similarity index 100% rename from skin/seaning/icon5.png rename to src/skin/seaning/icon5.png diff --git a/skin/seaning/icon6.png b/src/skin/seaning/icon6.png similarity index 100% rename from skin/seaning/icon6.png rename to src/skin/seaning/icon6.png diff --git a/skin/seaning/icon7.png b/src/skin/seaning/icon7.png similarity index 100% rename from skin/seaning/icon7.png rename to src/skin/seaning/icon7.png diff --git a/skin/seaning/icon8.png b/src/skin/seaning/icon8.png similarity index 100% rename from skin/seaning/icon8.png rename to src/skin/seaning/icon8.png diff --git a/skin/seaning/icon9.png b/src/skin/seaning/icon9.png similarity index 100% rename from skin/seaning/icon9.png rename to src/skin/seaning/icon9.png diff --git a/skin/seaning/style.css b/src/skin/seaning/style.css similarity index 100% rename from skin/seaning/style.css rename to src/skin/seaning/style.css