WHY IS IS A MERGE ERROR

2024-11-14 23:56:53 -05:00 · 2024-11-14 23:56:53 -05:00 · 88e28c05b5
parent 54b3e45af8 1730026215
commit 88e28c05b5
1 changed files with 0 additions and 1 deletions
--- a/src/manager.cpp
+++ b/src/manager.cpp
@ -236,5 +236,4 @@ namespace assign3
        topology_function = std::make_unique<gaussian_function_t>();
    }
 }