From c2b2ba7f6a749709695e3e9d0a60174b1554e7be Mon Sep 17 00:00:00 2001 From: Derek Witcpalek Date: Mon, 20 Apr 2020 21:25:59 -0400 Subject: [PATCH] moved files that were missed by automatic merge --- .../src/gazebo_models/paper_bag/Paper Bag.DAE | 0 .../gazebo_models/paper_bag/images/paper-bag-1.jpg | Bin .../src/gazebo_models/paper_bag/model.config | 0 .../src/gazebo_models/paper_bag/model.sdf | 0 .../src/gazebo_models/pop_can/images/pop-can-1.jpg | Bin .../src/gazebo_models/pop_can/model.config | 0 .../rrrobot_ws}/src/gazebo_models/pop_can/model.sdf | 0 .../src/gazebo_models/pop_can/original_5.stl | Bin 8 files changed, 0 insertions(+), 0 deletions(-) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/paper_bag/Paper Bag.DAE (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/paper_bag/images/paper-bag-1.jpg (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/paper_bag/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/paper_bag/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/pop_can/images/pop-can-1.jpg (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/pop_can/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/pop_can/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/pop_can/original_5.stl (100%) diff --git a/rrrobot_ws/src/gazebo_models/paper_bag/Paper Bag.DAE b/src/rrrobot_ws/src/gazebo_models/paper_bag/Paper Bag.DAE similarity index 100% rename from rrrobot_ws/src/gazebo_models/paper_bag/Paper Bag.DAE rename to src/rrrobot_ws/src/gazebo_models/paper_bag/Paper Bag.DAE diff --git a/rrrobot_ws/src/gazebo_models/paper_bag/images/paper-bag-1.jpg b/src/rrrobot_ws/src/gazebo_models/paper_bag/images/paper-bag-1.jpg similarity index 100% rename from rrrobot_ws/src/gazebo_models/paper_bag/images/paper-bag-1.jpg rename to src/rrrobot_ws/src/gazebo_models/paper_bag/images/paper-bag-1.jpg diff --git a/rrrobot_ws/src/gazebo_models/paper_bag/model.config b/src/rrrobot_ws/src/gazebo_models/paper_bag/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/paper_bag/model.config rename to src/rrrobot_ws/src/gazebo_models/paper_bag/model.config diff --git a/rrrobot_ws/src/gazebo_models/paper_bag/model.sdf b/src/rrrobot_ws/src/gazebo_models/paper_bag/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/paper_bag/model.sdf rename to src/rrrobot_ws/src/gazebo_models/paper_bag/model.sdf diff --git a/rrrobot_ws/src/gazebo_models/pop_can/images/pop-can-1.jpg b/src/rrrobot_ws/src/gazebo_models/pop_can/images/pop-can-1.jpg similarity index 100% rename from rrrobot_ws/src/gazebo_models/pop_can/images/pop-can-1.jpg rename to src/rrrobot_ws/src/gazebo_models/pop_can/images/pop-can-1.jpg diff --git a/rrrobot_ws/src/gazebo_models/pop_can/model.config b/src/rrrobot_ws/src/gazebo_models/pop_can/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/pop_can/model.config rename to src/rrrobot_ws/src/gazebo_models/pop_can/model.config diff --git a/rrrobot_ws/src/gazebo_models/pop_can/model.sdf b/src/rrrobot_ws/src/gazebo_models/pop_can/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/pop_can/model.sdf rename to src/rrrobot_ws/src/gazebo_models/pop_can/model.sdf diff --git a/rrrobot_ws/src/gazebo_models/pop_can/original_5.stl b/src/rrrobot_ws/src/gazebo_models/pop_can/original_5.stl similarity index 100% rename from rrrobot_ws/src/gazebo_models/pop_can/original_5.stl rename to src/rrrobot_ws/src/gazebo_models/pop_can/original_5.stl