simple fix after merge

Author: q4a

src/utils/xrMiscMath/xrMiscMath.vcxproj

@@ -93,11 +93,7 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-<<<<<<< HEAD
-      <LanguageStandard>stdcpp14</LanguageStandard>
-=======
       <LanguageStandard>stdcpp17</LanguageStandard>
->>>>>>> upstream/xd_dev
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">