Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5986


Ignore:
Timestamp:
04/08/11 15:32:13 (12 years ago)
Author:
dkahn
Message:

#1198 fixed web config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/HLWebPluginHost.csproj

    r5973 r5986  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
     
    7373      <DependentUpon>Global.asax</DependentUpon>
    7474    </Compile>
    75 <<<<<<< .mine
     75
    7676    <Compile Include="Lib\HLServiceMembershipProvider.cs" />
    77 =======
    7877    <Compile Include="Helpers\Query.cs" />
    79 >>>>>>> .r5972
    8078    <Compile Include="Models\AccountModels.cs" />
    8179    <Compile Include="PluginLib\AssemblyResourceProvider.cs" />
Note: See TracChangeset for help on using the changeset viewer.