gitignore merge 충돌수정

This commit is contained in:
chicpro
2014-03-31 17:06:47 +09:00
2 changed files with 5 additions and 5 deletions

2
.gitignore vendored
View File

@ -6,7 +6,7 @@ sirgle/
test.php
*.key
*.sh
cheditor5/
log
g5_tree
cheditor*/
ckeditor43/