fix merge miss

srz-zumix · Dec 16, 2019 · 2e5455e · 2e5455e
1 parent 6a953e2
commit 2e5455e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/include/internal/iutest_stdlib.hpp b/include/internal/iutest_stdlib.hpp
@@ -314,15 +314,12 @@
 #  endif
 #endif
 
-<<<<<<< HEAD
-=======
 #if !defined(IUTEST_HAS_CXX_HDR_CHARCONV)
 #  if __has_include(<charconv>)
 #    define IUTEST_HAS_CXX_HDR_CHARCONV     1
 #  endif
 #endif
 
->>>>>>> origin/develop
 // apple(xcode) clang
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #  if __MAC_OS_X_VERSION_MIN_REQUIRED < 101500