Compare commits
No commits in common. "05fb45dd98f6643ac1b49aaf5bf697081db3a01b" and "99103851de6cafb1bfd9a41feefce77057f5044d" have entirely different histories.
05fb45dd98
...
99103851de
|
|
@ -113,15 +113,8 @@ _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 (무시파일 수정)
|
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,4 @@
|
||||||
|
// <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.
|
|
@ -0,0 +1,4 @@
|
||||||
|
// <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