Commit 47581da5 authored by Andrew Wilson's avatar Andrew Wilson
Browse files

BUG: Fix merge conflict

parent d58036aa
Pipeline #240831 passed with stage
......@@ -373,10 +373,7 @@ add_subdirectory(Source/CollisionDetection)
add_subdirectory(Source/CollisionHandling)
add_subdirectory(Source/Scene)
add_subdirectory(Source/SimulationManager)
<<<<<<< HEAD
add_subdirectory(Source/Testing)
=======
>>>>>>> d1989b9d (REFAC: Remove apiutils)
add_subdirectory(Source/Filtering)
add_subdirectory(Source/FilteringCore)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment