Merge?

Signed-off-by: Michael Carlstrom <[email protected]>
ros2 · Mar 1, 2024 · ebfdce1 · ebfdce1
1 parent e3e3bcf
commit ebfdce1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/rclpy/rclpy/duration.py b/rclpy/rclpy/duration.py
@@ -19,6 +19,10 @@
 from rclpy.impl.implementation_singleton import rclpy_implementation as _rclpy
 
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 3538803 (update type alias name)
 class DurationType:
     """Type alias of _rclpy.rcl_duration_t."""