Merge branch 'RelationalCohesion' of https://github.com/kmkristof/Cod…

…eCompass into RelationalCohesion
Ericsson · May 22, 2024 · 55078ec · 55078ec
2 parents 5b51959 + 61a1f5f
commit 55078ec
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp b/plugins/cpp_metrics/parser/src/cppmetricsparser.cpp
@@ -142,6 +142,7 @@ void CppMetricsParser::functionMcCabe()
   });
 }
 
+<<<<<<< HEAD
 void CppMetricsParser::functionBumpyRoad()
 {
   util::OdbTransaction {_ctx.db} ([&, this]
@@ -166,6 +167,8 @@ void CppMetricsParser::functionBumpyRoad()
   });
 }
 
+=======
+>>>>>>> 61a1f5fe2912f2abe1c177573b0e7c828b5577af
 void CppMetricsParser::relationalCohesion()
 {
   util::OdbTransaction {_ctx.db} ([&, this]