web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@ </site> <site name="web" id="2"> <application path="/" applicationPool="Clr4IntegratedAppPool"> <virtualDirectory path="/" physicalPath="D:\Company\SMGW_NewWeb\web\web" /> <virtualDirectory path="/" physicalPath="C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\web" /> </application> <bindings> <binding protocol="http" bindingInformation="*:60960:localhost" /> web/.vs/Web/v16/.suoBinary files differ
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cacheBinary files differ
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@ <<<<<<< HEAD 0544a4b948cdc93476250066129b440538ad7759 ======= 824b8542c2793ad4f659f2bbdcf31228b48c7d47 >>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -5,3 +5,10 @@ D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.dll C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.pdb C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb web/Dao/obj/Debug/Dao.dllBinary files differ
web/Dao/obj/Debug/Dao.pdbBinary files differ
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
web/Lib/Dao.dllBinary files differ
web/Lib/Dao.pdbBinary files differ
web/Lib/Model.dllBinary files differ
web/Lib/Model.pdbBinary files differ
web/Model/obj/Debug/Model.csproj.AssemblyReference.cacheBinary files differ
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@ <<<<<<< HEAD 1bacd091eedbdb18186fe1adccdde3305270d490 ======= fde6d962a77aae709844cba5e3ccabd0c6a77d01 >>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -7,7 +7,6 @@ D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb <<<<<<< HEAD C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Model.dll C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Model.pdb C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache @@ -16,3 +15,4 @@ C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb ======= >>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache web/Model/obj/Debug/Model.dllBinary files differ
web/Model/obj/Debug/Model.pdbBinary files differ
web/web/Bin/Dao.dllBinary files differ
web/web/Bin/Dao.pdbBinary files differ
web/web/Bin/Model.dllBinary files differ
web/web/Bin/Model.pdbBinary files differ
web/web/Bin/UMCLib.dllBinary files differ
