firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

gitignore 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-07-09 10:02:56 +09:00
parent 4d8500be02
commit d9b8d31225
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -10,7 +10,4 @@ cheditor*/
ckeditor43/ ckeditor43/
log/ log/
g5_tree/ g5_tree/
<<<<<<< HEAD
=======
naver*.html naver*.html
>>>>>>> g5