MES-WEB-API.git

			@@ -1,11 +1,8 @@
			<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<<<<<<< HEAD
			<LastActiveSolutionConfig>Debug\|x86</LastActiveSolutionConfig>
			=======
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			>>>>>>> a7a9ef4b0ddc99b7fe442bcd18f1c72364453adb
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />
			@@ -13,12 +10,9 @@
			<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
			<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
			<UseGlobalApplicationHostFile />
			<<<<<<< HEAD
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
			=======
			<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
			>>>>>>> 8deaa1b9ce935bab8fbad806f3c13e8cb405771e
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile7.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ShowAllFiles</ProjectView>
			</PropertyGroup>
			<ProjectExtensions>