From 69e8f8ea1981f5f750150ba8d948a5b01ae8a942 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Thu, 13 Apr 2023 23:47:03 -0700
Subject: [PATCH] Add missing build_export_depends to controller_interface
 (#989)

(cherry picked from commit 437d37b6b395d0fa29c35bb50716103275f80dae)

# Conflicts:
#	controller_interface/package.xml
---
 controller_interface/package.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/controller_interface/package.xml b/controller_interface/package.xml
index df0992261d..018c9af695 100644
--- a/controller_interface/package.xml
+++ b/controller_interface/package.xml
@@ -14,9 +14,14 @@
   <build_depend>rclcpp_lifecycle</build_depend>
   <build_depend>sensor_msgs</build_depend>
 
+<<<<<<< HEAD
   <exec_depend>hardware_interface</exec_depend>
   <exec_depend>rclcpp_lifecycle</exec_depend>
   <exec_depend>sensor_msgs</exec_depend>
+=======
+  <build_export_depend>hardware_interface</build_export_depend>
+  <build_export_depend>rclcpp_lifecycle</build_export_depend>
+>>>>>>> 437d37b (Add missing build_export_depends to controller_interface (#989))
 
   <test_depend>ament_cmake_gmock</test_depend>