We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 628b1af commit c508161Copy full SHA for c508161
src/xinterpreter.cpp
@@ -406,21 +406,12 @@ __get_cxx_version ()
406
std::istringstream stream(non_standard_paths);
407
std::string path;
408
while (std::getline(stream, path, path_separator))
409
-<<<<<<< HEAD
410
-+ {
411
- if (!path.empty())
412
413
- Cpp::AddIncludePath(path.c_str());
414
-+ }
415
416
-=======
417
{
418
if (!path.empty())
419
420
Cpp::AddIncludePath(path.c_str());
421
}
422
423
->>>>>>> 489e506 (Format xinterpreter.cpp with clang-format)
424
425
426
void interpreter::init_preamble()
0 commit comments