g5 merge 충돌 수정

2013-11-26 13:53:01 +09:00
parent 21d91bb19d 3e732b63b5
commit 453623d725
2 changed files with 10 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,25 +2,15 @@ dbconfig.php
 log
 .htaccess
 data
-/.htaccess
 data/
 test
+.htaccess
 config.php
+data/
+test/
 sirgle
-sr_*
-google*
-skin/latest/basic2
-rankiss*
-thumb.lib.php
 test.php
-itzimara*
-nemoluv*
-cheditor*
 *.key
 g5_tree
 *.sh
-kcho07_rss/
-mobile/skin/board/bach72_mobile/
-skin/board
-lessc.inc.php
-lessc.php
+cheditor5/