Permalink
Browse files

Merge https://github.com/lennykean/NoteCards

Conflicts:
	NoteCards.Test/NoteCards.Test.csproj
  • Loading branch information...
2 parents 2e0706a + ae98ae9 commit d6bf821b6b43a83575e9a2d56ce0d7f1030c3b5f @lennykean committed Feb 24, 2012
Showing with 13 additions and 0 deletions.
  1. +13 −0 NoteCards.Test/NoteCards.Test.csproj
@@ -34,8 +34,12 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+<<<<<<< HEAD
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<Private>True</Private>
+=======
+ <Reference Include="Moq">
+>>>>>>> ae98ae9cabfa9bab4c9c683a7ada1835f0a20489
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
@@ -53,14 +57,23 @@
<Compile Include="MainPresenterTests.cs" />
</ItemGroup>
<ItemGroup>
+<<<<<<< HEAD
+=======
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+>>>>>>> ae98ae9cabfa9bab4c9c683a7ada1835f0a20489
<ProjectReference Include="..\NoteCards\NoteCards.csproj">
<Project>{0276A578-848C-4674-9C94-3B10DCFE82D6}</Project>
<Name>NoteCards</Name>
</ProjectReference>
</ItemGroup>
+<<<<<<< HEAD
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
+=======
+>>>>>>> ae98ae9cabfa9bab4c9c683a7ada1835f0a20489
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

0 comments on commit d6bf821

Please sign in to comment.