From aa5c394722e2149396bf88f990a55d3cce825525 Mon Sep 17 00:00:00 2001
From: vivek-shankar <robovivek@gmail.com>
Date: Fri, 17 Feb 2017 16:50:38 -0500
Subject: [PATCH] launch file conflict correction

---
 launch/xbeemav.launch | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/launch/xbeemav.launch b/launch/xbeemav.launch
index e2b9730..060dac3 100644
--- a/launch/xbeemav.launch
+++ b/launch/xbeemav.launch
@@ -7,10 +7,6 @@
 	<!--  xmee_mav Topics and Services Names -->
 	<param name="Xbee_In_From_Buzz" type="str" value="outMavlink" />
 	<param name="Xbee_Out_To_Buzz" type="str" value="inMavlink" />
-<<<<<<< HEAD
-	<param name="No_of_dev" type="int" value="3" />
-=======
->>>>>>> a16cf8b196cb6b63ef52ea26b8cb9a8e861d84d1
 	<param name="Xbee_In_From_Controller" type="str" value="xbee_cmd" />
 	<param name="Xbee_Out_To_Controller" type="str" value="mav_dji_cmd" />
 </launch>