Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/22/10 11:00:00 (14 years ago)
Author:
cneumuel
Message:

resolved remaining conflicts in 3.3-HiveMigration branch (#1091)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4074 r4076  
    138138  </ItemGroup>
    139139  <ItemGroup>
    140     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    141       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    142       <Name>HeuristicLab.Core-3.2</Name>
    143     </ProjectReference>
    144     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    145       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    146       <Name>HeuristicLab.DataAccess-3.2</Name>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    149       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    150       <Name>HeuristicLab.PluginInfrastructure</Name>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj">
    153       <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
    154       <Name>HeuristicLab.Tracing-3.2</Name>
    155     </ProjectReference>
    156   </ItemGroup>
    157   <ItemGroup>
    158140    <None Include="HeuristicLab.snk" />
    159141    <None Include="Properties\AssemblyInfo.frame" />
    … …  
    163145      <SubType>Designer</SubType>
    164146    </EmbeddedResource>
     147  </ItemGroup>
     148  <ItemGroup>
     149    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     150      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     151      <Name>HeuristicLab.DataAccess-3.3</Name>
     152    </ProjectReference>
    165153  </ItemGroup>
    166154  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.