Merge branch 'develop'

6c4c4adf · weitianhua · 5b105aee · d07a2b1c · 6c4c4adf
Commit 6c4c4adf authored Sep 04, 2020 by weitianhua
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Web.config WebApi/Web.config +0 -4

No files found.
--- a/WebApi/Web.config
+++ b/WebApi/Web.config
@@ -74,11 +74,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-<<<<<<< Updated upstream
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-=======
        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
->>>>>>> Stashed changes
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />