무시파일 수정
This commit is contained in:
parent
75af9a72ad
commit
05fb45dd98
|
|
@ -113,8 +113,15 @@ _pkginfo.txt
|
||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
*.cache
|
*.cache
|
||||||
*.csproj.AssemblyReference.cache
|
*.csproj.AssemblyReference.cache
|
||||||
=======
|
=======
|
||||||
/BO/Logs
|
/BO/Logs
|
||||||
>>>>>>> ca8967d (추가개발1)
|
>>>>>>> ca8967d (추가개발1)
|
||||||
|
=======
|
||||||
|
/BO/Logs/
|
||||||
|
/FO/Logs/
|
||||||
|
/BO/obj/
|
||||||
|
/FO/obj/
|
||||||
|
>>>>>>> 74dfc5b (무시파일 수정)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue