g5 merge 충돌 수정

2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,12 @@
+<<<<<<< HEAD
 dbconfig.php
 log
 .htaccess
 data
+=======
+/.htaccess
+data/
+>>>>>>> g5
 test
 config.php
 sirgle
@ -11,9 +16,16 @@ skin/latest/basic2
 rankiss*
 thumb.lib.php
 test.php
+<<<<<<< HEAD
 g4s_tree
+=======
+>>>>>>> g5
 itzimara*
 nemoluv*
 cheditor*
 *.key
+<<<<<<< HEAD
 g5_tree
+=======
+*.sh
+>>>>>>> g5