Skip to content
Browse files

Fixed borked visual studio project.

  • Loading branch information...
1 parent d5ea80f commit 4bdde97b1c3b33607cec31dc6f50ccedc58b1337 @cataphract committed
Showing with 2 additions and 5 deletions.
  1. +2 −5 discount.vcxproj
View
7 discount.vcxproj
@@ -114,11 +114,8 @@
<ClCompile Include="lib\resource.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_TS|Win32'"> /wd4996 /MP /LDd /wd4996 /MP /LDd </AdditionalOptions>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_TS|Win32'">.\..\..\Debug_TS\ext\discount\lib/</ObjectFileName>
- </ClCompile>
-<<<<<<< HEAD
-=======
- <ClCompile Include="lib\setup.c" />
->>>>>>> 2ba9082cee8f2c7bdf6c93a67ff6438ee4af1a58
+ </ClCompile>
+ <ClCompile Include="lib\setup.c" />
<ClCompile Include="lib\tags.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_TS|Win32'"> /wd4996 /MP /LDd /wd4996 /MP /LDd </AdditionalOptions>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_TS|Win32'">.\..\..\Debug_TS\ext\discount\lib/</ObjectFileName>

0 comments on commit 4bdde97

Please sign in to comment.
Something went wrong with that request. Please try again.