merge

Former-commit-id: 007c8e6145d70eb1fa8ce7a78c00c5613a01faed
yifan96 · Apr 9, 2015 · d15f1e8 · d15f1e8
2 parents 9b50cf2 + 45d5dd5
commit d15f1e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,11 @@ We tested DSL Grid3D on Ubuntu 12.04 (Precise) and ROS hydro.
 
 In your ROS package path, clone the repository:
 
+<<<<<<< HEAD
     git clone https://github.com/jhu-asco/dsl_grid3d.git
+=======
+    git clone https://github.com/repo.git
+>>>>>>> 80b8f3e441bcef19d413ede0cf98d0a1ad3522cf
 
 Install the included dsl library
 
@@ -22,11 +26,14 @@ Run catkin_make from the root directory, as usual.
 
 # 2 Quickstart / Minimal Setup
 
+<<<<<<< HEAD
 Unarchive the mesh file:
 
 		cd data 
 		tar -zxvf hackerman2.tar.gz
 
+=======
+>>>>>>> 80b8f3e441bcef19d413ede0cf98d0a1ad3522cf
 Launch the rviz viewer:
 
 		roslaunch dsl_grid3d rviz.launch

diff --git a/data/hackerman.jpg b/data/hackerman.jpg
diff --git a/data/hackerman2.dae.REMOVED.git-id b/data/hackerman2.dae.REMOVED.git-id
@@ -0,0 +1 @@
+dfbc1f584bbdf3ccfa617d1603f0add71cdc13d1