generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-21 02:00:33 +01:00
Code Issues Projects Releases Wiki Activity

Update TestSuite_vs120.vcxproj

Browse Source
This commit is contained in:
Aleksandar Fabijanic 2016-03-07 22:13:28 -08:00
parent 3eb023132b
commit c3041eefd5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/testsuite/TestSuite_vs120.vcxproj
View File

@ -588,11 +588,6 @@
<ClInclude Include="src\SimpleHashTableTest.h"/>
<ClInclude Include="src\VarTest.h"/>
</ItemGroup>
<<<<<<< HEAD
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<ImportGroup Label="ExtensionTargets"/>
=======
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
>>>>>>> develop
</Project>