b7193e19da
Incorrect resolution of merge conflict resulted in not updating tests/catch/unit/memory/CMakeLists.txt correctly