Fixing merge conflict resolution

2025-03-18 19:22:43 +02:00
parent d75dd85209
commit bf8c8f9dad
10 changed files with 123 additions and 27 deletions
--- a/test/manual/minimal.cpp
+++ b/test/manual/minimal.cpp
@@ -1,6 +1,5 @@
 #include "minimal_lib.h"

-// We're not installing anything, so this is a bit weird here
 #include "../../include/hiload/hiload.h"

 #include <chrono>