From ccd9d0852ef13f706a8a8851bb8da0be3653ab93 Mon Sep 17 00:00:00 2001
From: min <ken1336@naver.com>
Date: Sun, 17 Feb 2019 20:56:35 +0900
Subject: [PATCH] =?utf8?q?=EC=86=8C=EC=8A=A4=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ZipProject/Startup.cs | 71 ++-----------------------------------------
 1 file changed, 2 insertions(+), 69 deletions(-)

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