mvc 5

Do it!

Author: njfsilva

jQuery-File-Upload.MVC3/Views/Web.config

@@ -38,13 +38,8 @@
     -->
     <pages
         validateRequest="false"
-<<<<<<< HEAD
         pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
         pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-=======
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
->>>>>>> origin/master
         userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
       <controls>
         <add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />

jQuery-File-Upload.MVC3/Web.config

@@ -51,11 +51,7 @@
     <!--
       <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
     </httpHandlers>-->
-<<<<<<< HEAD
     <compilation debug="true" targetFramework="4.6" />
-=======
-    <compilation debug="true" targetFramework="4.5.2" />
->>>>>>> origin/master
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
@@ -75,23 +71,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-<<<<<<< HEAD
         <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="3.0.0.0" />
-=======
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
->>>>>>> origin/master
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-<<<<<<< HEAD
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-=======
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
->>>>>>> origin/master
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

jQuery-File-Upload.MVC3/jQuery-File-Upload.MVC3.csproj

@@ -13,11 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>jQuery_File_Upload.MVC3</RootNamespace>
     <AssemblyName>jQuery-File-Upload.MVC3</AssemblyName>
-<<<<<<< HEAD
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-=======
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
->>>>>>> origin/master
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
     <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>