WHY IS IS A MERGE ERROR
commit
88e28c05b5
|
@ -236,5 +236,4 @@ namespace assign3
|
|||
|
||||
topology_function = std::make_unique<gaussian_function_t>();
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue