aboutsummaryrefslogtreecommitdiff
path: root/src/test/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/CMakeLists.txt')
-rw-r--r--src/test/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 8618ae6..773f685 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,7 +1,12 @@
target_sources(test_main PUBLIC
dummy.cpp
# audio.cpp
+<<<<<<< HEAD
PhysicsTest.cpp
CollisionTest.cpp
+=======
+ # PhysicsTest.cpp
+ ParticleTest.cpp
+>>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683
)