apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up merge

Browse Source
This commit is contained in:
Paul Bovbel 2014-09-13 16:42:28 -04:00 committed by Paul Bovbel
parent 08e83a67bf
commit 56c091eb38
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcl_ros/pcl_nodelets.xml
View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
=======
<!-- PCL Features library component --> <!-- PCL Features library component -->
<library path="lib/libpcl_ros_features"> <library path="lib/libpcl_ros_features">
<class name="pcl/BoundaryEstimation" type="BoundaryEstimation" base_class_type="nodelet::Nodelet"> <class name="pcl/BoundaryEstimation" type="BoundaryEstimation" base_class_type="nodelet::Nodelet">
@ -36,8 +33,6 @@
in parallel, using the OpenMP standard. in parallel, using the OpenMP standard.
</description> </description>
</class> </class>
>>>>>>> c3c0d30... Merge pull request #60 from martimorta/hydro-devel
<!-- PCL IO library component --> <!-- PCL IO library component -->
<library path="lib/libpcl_ros_io"> <library path="lib/libpcl_ros_io">