From 8f1ea8970c67fde1f6fa8286b72a647d5b3a6f4d Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Sat, 8 Apr 2023 12:18:13 -0700
Subject: [PATCH] fix merge conflict

Signed-off-by: William Woodall <william@osrfoundation.org>
---
 rmw/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rmw/CMakeLists.txt b/rmw/CMakeLists.txt
index e536e517..edf7c3ac 100644
--- a/rmw/CMakeLists.txt
+++ b/rmw/CMakeLists.txt
@@ -29,7 +29,6 @@ set(rmw_sources
   "src/allocators.c"
   "src/convert_rcutils_ret_to_rmw_ret.c"
   "src/discovery_options.c"
-  "src/dynamic_message_type_support.c"
   "src/event.c"
   "src/init.c"
   "src/init_options.c"