From 4ebad08517050e85f31cf054c91d186f2d969ee5 Mon Sep 17 00:00:00 2001
From: Ruixiang Du <ruixiang.du@westonrobot.com>
Date: Fri, 21 Aug 2020 17:11:57 +0800
Subject: [PATCH] fixed conflicts in readme

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 5c7689b..520ff56 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,11 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
 1. Install dependent libraries
 
     ```
-<<<<<<< HEAD
     $ sudo apt install libasio-dev
     $ sudo apt install ros-$ROS_DISTRO-teleop-twist-keyboard
-=======
     $ sudo apt install ros-melodic-teleop-twist-keyboard
     $ sudo apt-get install ros-melodic-joint-state-publisher-gui
     $ sudo apt install ros-melodic-ros-controllers
->>>>>>> scout_sim
     ```
 
 2. Clone the packages into your catkin workspace and compile
@@ -58,8 +55,6 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
     $ roslaunch scout_bringup scout_minimal_uart.launch
     ```
 
-<<<<<<< HEAD
-=======
 * Start the Webots-based simulation (Scout V1)
 
     ```
@@ -72,7 +67,6 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
     $ roslaunch scout_bringup scout_base_gazebo_sim.launch
     ```
 
->>>>>>> scout_sim
 * Start the keyboard tele-op node
 
     ```