Skip to content

Commit

Permalink
fix merge conflict (#354)
Browse files Browse the repository at this point in the history
Signed-off-by: William Woodall <[email protected]>
  • Loading branch information
wjwwood authored Apr 8, 2023
1 parent ab5cd2c commit 91b1dc7
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion rmw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 91b1dc7

Please sign in to comment.