Update scores-graphics.cpp deleted markers

plibither8 · Jun 22, 2024 · 29de2cd · 29de2cd
1 parent 85dd5ff
commit 29de2cd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/scores-graphics.cpp b/src/scores-graphics.cpp
@@ -56,12 +56,12 @@ std::string ScoreboardOverlay(scoreboard_display_data_list_t sbddl) {
              << "\n";
     };
 
-<<<<<<< HEAD
+
     for (const auto& s : sbddl) { // auto REFERENCE s
-=======
+
     // Use reference to avoid unnecessary copying of complex structures
     for (const auto& s : sbddl) {
->>>>>>> bc8a89f (Set C++17 standard in CMakeLists.txt for std::filesystem support in menu.cpp. Same as adding .vscode into .gitignore and changed some code deleting comments and changing comments)
+
       print_score_stat(s);
     }
     str_os << sp << bottom_border_text << "\n";