Update urdf_config.cpp

moveit · Jan 20, 2025 · a67c37b · a67c37b
1 parent e19ac9f
commit a67c37b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp b/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp
@@ -116,17 +116,13 @@ void URDFConfig::setPackageName()
 void URDFConfig::loadFromPackage(const std::filesystem::path& package_name, const std::filesystem::path& relative_path,
                                  const std::string& xacro_args)
 {
-<<<<<<< HEAD
-  urdf_pkg_name_ = package_name;
-=======
   const std::filesystem::path package_path = getSharePath(package_name.string());
   if (package_path.empty())
   {
     throw std::runtime_error("URDF/COLLADA package not found: ''" + package_name.string());
   }
 
   urdf_pkg_name_ = package_name.string();
->>>>>>> 2b9173b37 (Explicit convert from std::filesystem::path to std::string for Windows compatibility (#3249))
   urdf_pkg_relative_path_ = relative_path;
   xacro_args_ = xacro_args;