충돌 해결

diff --git a/ZipProject/Startup.cs b/ZipProject/Startup.cs
index f9327b8c171f84ad71acf2af5d3548724a92d3ad..889b7287c46938cdbdd2fa35f309cbeafab24cbf 100644 (file)
--- a/ZipProject/Startup.cs
+++ b/ZipProject/Startup.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD\r
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
@@ -62,3 +63,69 @@ namespace ZipProject
     }\r
   }\r
 }\r
+=======\r
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Threading.Tasks;\r
+using Microsoft.AspNetCore.Builder;\r
+using Microsoft.AspNetCore.Hosting;\r
+using Microsoft.AspNetCore.Http;\r
+using Microsoft.AspNetCore.HttpsPolicy;\r
+using Microsoft.AspNetCore.Mvc;\r
+using Microsoft.Extensions.Configuration;\r
+using Microsoft.Extensions.DependencyInjection;\r
+\r
+namespace ZipProject\r
+{\r
+  public class Startup\r
+  {\r
+    public Startup(IConfiguration configuration)\r
+    {\r
+      Configuration = configuration;\r
+    }\r
+\r
+    public IConfiguration Configuration { get; }\r
+\r
+    // This method gets called by the runtime. Use this method to add services to the container.\r
+    public void ConfigureServices(IServiceCollection services)\r
+    {\r
+      services.Configure<CookiePolicyOptions>(options =>\r
+      {\r
+        // This lambda determines whether user consent for non-essential cookies is needed for a given request.\r
+        options.CheckConsentNeeded = context => false;\r
+        options.MinimumSameSitePolicy = SameSiteMode.None;\r
+      });\r
+      services.AddSession(s => s.IdleTimeout = TimeSpan.FromMinutes(5));\r
+      services.AddHttpContextAccessor();\r
+      services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);\r
+    }\r
+\r
+    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.\r
+    public void Configure(IApplicationBuilder app, IHostingEnvironment env)\r
+    {\r
+      if (env.IsDevelopment())\r
+      {\r
+        app.UseDeveloperExceptionPage();\r
+      }\r
+      else\r
+      {\r
+        app.UseExceptionHandler("/Home/Error");\r
+        app.UseHsts();\r
+      }\r
+\r
+      //app.UseHttpsRedirection();\r
+      app.UseStaticFiles();\r
+      app.UseCookiePolicy();\r
+      app.UseSession();\r
+      \r
+      app.UseMvc(routes =>\r
+      {\r
+        routes.MapRoute(\r
+                  name: "default",\r
+                  template: "{controller=WebZip}/{action=Index}/{id?}");\r
+      });\r
+    }\r
+  }\r
+}\r
+>>>>>>> 4fb88bf867ddbc39d58fdd0ea3b54669e05eee14\r