diff options
Diffstat (limited to 'src/example/CMakeLists.txt')
| -rw-r--r-- | src/example/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt index 5b7d7c2..d2ea926 100644 --- a/src/example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -28,10 +28,8 @@ add_example(proxy) add_example(db) add_example(ecs) add_example(scene_manager) -<<<<<<< HEAD add_example(collision) -======= +add_example(events) add_example(particles) add_example(gameloop) ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 |