모바일 플로팅 메뉴 스크립트 추가

2013-09-27 17:53:49 +09:00
parent 21ea906b81
commit 16fdd3d4e0
16 changed files with 216 additions and 74 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +1,9 @@
-<<<<<<< HEAD
 dbconfig.php
 log
 .htaccess
 data
-=======
 /.htaccess
 data/
->>>>>>> g5
 test
 config.php
 sirgle
@ -16,16 +13,9 @@ skin/latest/basic2
 rankiss*
 thumb.lib.php
 test.php
-<<<<<<< HEAD
-g4s_tree
-=======
->>>>>>> g5
 itzimara*
 nemoluv*
 cheditor*
 *.key
-<<<<<<< HEAD
 g5_tree
-=======
 *.sh
->>>>>>> g5