코드 병합

diff --git a/ZipProject.sln b/ZipProject.sln
index 6149bd4b27da2d854aad575257bc26986ccb72fe..e780624d78f3be56070b2c2fa751dea9a562aaad 100644 (file)
--- a/ZipProject.sln
+++ b/ZipProject.sln
@@ -4,8 +4,6 @@ VisualStudioVersion = 15.0.28010.2046
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZipProject", "ZipProject\ZipProject.csproj", "{8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MinZip", "MinZip\MinZip.vcxproj", "{D089DAE3-5308-4394-81A8-95811E4F2EC5}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -28,16 +26,6 @@ Global
                {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x64.Build.0 = Release|Any CPU\r
                {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x86.ActiveCfg = Release|Any CPU\r
                {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x86.Build.0 = Release|Any CPU\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x64.ActiveCfg = Debug|x64\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x64.Build.0 = Debug|x64\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x86.Build.0 = Debug|Win32\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|Any CPU.ActiveCfg = Release|Win32\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x64.ActiveCfg = Release|x64\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x64.Build.0 = Release|x64\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x86.ActiveCfg = Release|Win32\r
-               {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x86.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r