Commit b30f8e8c authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix merge conflict.

parent 394cd218

Workspace_msvc/lib_dec.vcxproj

+0 −4
Original line number Diff line number Diff line
@@ -68,11 +68,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

<<<<<<< HEAD

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

=======

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

>>>>>>> origin

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>