DEmon/iWareWms/iWareWms.csproj
@@ -3723,9 +3723,13 @@ <WebProjectProperties> <UseIIS>True</UseIIS> <AutoAssignPort>True</AutoAssignPort> <DevelopmentServerPort>0</DevelopmentServerPort> <DevelopmentServerPort>65031</DevelopmentServerPort> <DevelopmentServerVPath>/</DevelopmentServerVPath> <<<<<<< HEAD <IISUrl>http://localhost:8099</IISUrl> ======= <IISUrl>http://localhost:55234/</IISUrl> >>>>>>> c3984d64e9727d60a2a61682271bd52cc82712b9 <NTLMAuthentication>False</NTLMAuthentication> <UseCustomServer>False</UseCustomServer> <CustomServerUrl>
