Changeset 5986 for branches/WebApplication

Timestamp:

04/08/11 15:32:13 (14 years ago)

Author:

dkahn

Message:

#1198 fixed web config

File:

• branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/HLWebPluginHost.csproj (modified) (2 diffs)

branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/HLWebPluginHost.csproj

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -73 +73 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-<<<<<<< .mine
+
     <Compile Include="Lib\HLServiceMembershipProvider.cs" />
-=======
     <Compile Include="Helpers\Query.cs" />
->>>>>>> .r5972
     <Compile Include="Models\AccountModels.cs" />
     <Compile Include="PluginLib\AssemblyResourceProvider.cs" />