Fix conflicts

Signed-off-by: Martiño Crespo <[email protected]>
mcres · Aug 21, 2020 · 90c29b5 · 90c29b5
1 parent b7e7056
commit 90c29b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/examples/worlds/optical_tactile_sensor_plugin.sdf b/examples/worlds/optical_tactile_sensor_plugin.sdf
@@ -223,11 +223,11 @@
 
     <include>
     <pose>0 -0.7 0 0 0 3.14</pose>
-      <uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/OfficeChairBlue </uri>
+      <uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/OfficeChairBlue</uri>
     </include>
 
     <include>
-    <pose>-1.5 0 0 0 0 1.57</pose>
+    <pose>-1.5 0 0 0 0 0</pose>
       <uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/VendingMachine</uri>
     </include>