g4s 머지 후 충돌 코드 수정

2013-04-26 16:06:30 +09:00
parent da91511e5f da3c09523c
commit 9fece6bcd3
16 changed files with 180 additions and 125 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,14 @@
-data
 dbconfig.php
 log
 g4s
+.htaccess
+data
+config.php
+test
+sirgle
+sr_*
+google*
+skin/latest/basic2
+Rankiss*
+thumb.lib.php
+test.php