g5 merge 충돌 수정

2013-12-13 09:33:11 +09:00
parent b81c9089d6 6a344d1438
commit 791fb64d25
5 changed files with 51 additions and 36 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,16 +1,10 @@
-dbconfig.php
-log
-.htaccess
-data
-data/
-test
-.htaccess
-config.php
+!.gitignore
 data/
 test/
-sirgle
+sirgle/
 test.php
 *.key
-g5_tree
 *.sh
 cheditor5/
+log
+g5_tree