diff options
Diffstat (limited to 'src/test/CMakeLists.txt')
| -rw-r--r-- | src/test/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 773f685..50802de 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,12 +1,9 @@ target_sources(test_main PUBLIC dummy.cpp # audio.cpp -<<<<<<< HEAD PhysicsTest.cpp CollisionTest.cpp -======= # PhysicsTest.cpp ParticleTest.cpp ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 ) |