Skip to content

Commit c508161

Browse files
Format xinterpreter.cpp with clang-format
1 parent 628b1af commit c508161

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

Diff for: src/xinterpreter.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -406,21 +406,12 @@ __get_cxx_version ()
406406
std::istringstream stream(non_standard_paths);
407407
std::string path;
408408
while (std::getline(stream, path, path_separator))
409-
<<<<<<< HEAD
410-
+ {
411-
if (!path.empty())
412-
+ {
413-
Cpp::AddIncludePath(path.c_str());
414-
+ }
415-
+ }
416-
=======
417409
{
418410
if (!path.empty())
419411
{
420412
Cpp::AddIncludePath(path.c_str());
421413
}
422414
}
423-
>>>>>>> 489e506 (Format xinterpreter.cpp with clang-format)
424415
}
425416

426417
void interpreter::init_preamble()

0 commit comments

Comments
 (0)