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

    r4074 r4076  
    129129      <Name>HeuristicLab.Core-3.2</Name>
    130130    </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    132       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    133       <Name>HeuristicLab.DataAccess-3.2</Name>
    134     </ProjectReference>
    135131    <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
    136132      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
Note: See TracChangeset for help on using the changeset viewer.