fixup

Author: traversaro

test/test_urdf.py

@@ -195,15 +195,6 @@ def test_link_multiple_collision(self):
 </robot>'''
         self.parse_and_compare(xml)
 
-<<<<<<< HEAD
-=======
-        robot = urdf.Robot(name='test', version='1.0')
-        link = urdf.Link(name='link')
-        link.collision = urdf.Collision(geometry=urdf.Cylinder(length=1, radius=1))
-        link.collision = urdf.Collision(geometry=urdf.Cylinder(length=4, radius=0.5))
-        robot.add_link(link)
-        self.xml_and_compare(robot, xml)
-
     def test_collision_with_name(self):
         xml = '''<?xml version="1.0"?>
 <robot name="test" version="1.0">
@@ -217,7 +208,6 @@ def test_collision_with_name(self):
 </robot>'''
         self.parse_and_compare(xml)
 
->>>>>>> 66fcee5 (Support name attribute for collisions (#67))
     def test_version_attribute_not_enough_dots(self):
         xml = '''<?xml version="1.0"?>
 <robot name="test" version="1">