Compare commits
2 Commits
99103851de
...
05fb45dd98
| Author | SHA1 | Date |
|---|---|---|
|
|
05fb45dd98 | |
|
|
75af9a72ad |
|
|
@ -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 (무시파일 수정)
|
||||||
|
|
|
||||||
3231
FO/Logs/query.txt
3231
FO/Logs/query.txt
File diff suppressed because one or more lines are too long
7419
FO/Logs/query.txt.2
7419
FO/Logs/query.txt.2
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +0,0 @@
|
||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
|
|
||||||
Binary file not shown.
|
|
@ -1,4 +0,0 @@
|
||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
|
|
||||||
Loading…
Reference in New Issue