Format xinterpreter.cpp with clang-format

compiler-research · Dec 19, 2024 · c508161 · c508161
1 parent 628b1af
commit c508161
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp
@@ -406,21 +406,12 @@ __get_cxx_version ()
         std::istringstream stream(non_standard_paths);
         std::string path;
         while (std::getline(stream, path, path_separator))
-<<<<<<< HEAD
-+        {
-             if (!path.empty())
-+            {
-                 Cpp::AddIncludePath(path.c_str());
-+            }
-+        }
-=======
         {
             if (!path.empty())
             {
                 Cpp::AddIncludePath(path.c_str());
             }
         }
->>>>>>> 489e506 (Format xinterpreter.cpp with clang-format)
     }
 
     void interpreter::init_preamble()