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