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.Client.Communication/3.3/HeuristicLab.Hive.Client.Communication-3.3.csproj

    r4073 r4076  
    114114      <Name>HeuristicLab.Core-3.2</Name>
    115115    </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    117       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    118       <Name>HeuristicLab.DataAccess-3.2</Name>
    119     </ProjectReference>
    120     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    121       <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    122       <Name>HeuristicLab.Hive.Client.Common-3.2</Name>
    123     </ProjectReference>
    124     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     116    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    125117      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    126118      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
Note: See TracChangeset for help on using the changeset viewer.