fix merge conflict (#354)

Signed-off-by: William Woodall <[email protected]>

Author: wjwwood

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"