Cleaning up merge conflict in README

Author: vik748

README.md

@@ -70,23 +70,12 @@ source ~/spinnaker_ws/devel/setup.bash
 Modify the `params/test_params.yaml` file replacing the cam-ids and master cam serial number to match your camera's serial number. Then run the code as:
 ```bash
 # To launch nodelet verison of driver, use #
-
-<<<<<<< HEAD
-roslaunch spinnaker_camera_driver acquisition.launch
-=======
 roslaunch spinnaker_sdk_camera_driver acquisition.launch
 
 # To launch node version of driver, use #
->>>>>>> master
-
-roslaunch spinnaker_sdk_camera_driver acquisition_node.launch
+roslaunch spinnaker_sdk_camera_driver node_acquisition.launch
 
-<<<<<<< HEAD
-roslaunch spinnaker_camera_driver node_acquisition.launch
-=======
->>>>>>> master
 # Test that the images are being published by running
-
 rqt_image_view
 ```
 ## Parmeters