gper/Gnuboard5
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitignore 충돌수정

Browse Source
This commit is contained in:
chicpro committed 2014-07-09 10:02:56 +09:00
1 parent 4d8500be02
commit d9b8d31225
1 file changed
-3
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-3
View File
@@ -10,7 +10,4 @@ cheditor*/
ckeditor43/
log/
g5_tree/
<<<<<<< HEAD
=======
naver*.html
>>>>>>> g5