revert

CMU-Robotics-Club · Oct 28, 2022 · c4c20ec · c4c20ec
1 parent 95e9818
commit c4c20ec
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 779 deletions.
diff --git a/.env.dev b/.env.dev
diff --git a/.env.prod b/.env.prod
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -20,38 +20,8 @@ A complete re-write of the old RoboBuggy.
 ### ROS
 - Navigate to the `rb_ws` workspace. This is where all ROS and Python programs will live.
 - To build the ROS workspace and source it, run:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-        catkin_make
-        source devel/setup.bash
-        
-### Running Example Publisher and Subcriber Scripts
-- Ensure you've sourced the `rb_ws` workspace.
-- Make your workspace by running `catkin_make`.
-- Run `roscore` in one terminal.
-- Navigate to `rb_ws/src/buggy/scripts/` and run `test_publisher.py` and `test_subscriber.py` in two separate terminals. (Example command would be `python3 test_publisher.py`)
-- Understand what's going on in the publisher terminal and the subscriber terminal.
-- Open another terminal window and use `rostopic` (http://wiki.ros.org/rostopic) to check everything is working correctly.
-
-
-
-### Notes for Christian
-/rb_ws/src/buggy is the package for our project
-("catkin_create_pkg buggy std_msgs rospy roscpp geometry_msgs")
->>>>>>> parent of 575e33e... Update README.md
-
-        catkin_make
-=======
-        
->>>>>>> parent of 3507d13... Revert "automaticallyt changed?"
-        source devel/setup.bash
-=======
 
         source devel/setup.bash
->>>>>>> parent of 3507d13... Revert "automaticallyt changed?"
         catkin_make     
 
 ### Running Example Publisher and Subcriber Scripts

diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/python-requirements.txt b/python-requirements.txt
diff --git a/rb_ws/.catkin_workspace b/rb_ws/.catkin_workspace
diff --git a/rb_ws/.gitignore b/rb_ws/.gitignore
diff --git a/rb_ws/build/CMakeFiles/Makefile.cmake b/rb_ws/build/CMakeFiles/Makefile.cmake