Fixed merge with Mark's fork

pull/6/head
Keivan 14 years ago
commit 9c1ebd8ac4

@ -86,12 +86,14 @@
<Content Include="Libs\FizzWare.NBuilder.dll" /> <Content Include="Libs\FizzWare.NBuilder.dll" />
<Content Include="Libs\Moq.dll" /> <Content Include="Libs\Moq.dll" />
<Content Include="Libs\Moq.xml" /> <Content Include="Libs\Moq.xml" />
<Content Include="Files\Queue.xml">
<Content Include="Files\Queue.xml"> <Content Include="Files\Queue.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Files\QueueEmpty.xml"> <Content Include="Files\QueueEmpty.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Files\QueueError.txt"> <Content Include="Files\QueueError.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

Loading…
Cancel
Save