From 7b2898eaeecabadfb1109bfb9896bf1de3eb7294 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Wed, 19 Oct 2016 18:29:34 +0200
Subject: [PATCH] Fix merge collision

---
 src/drivers/px4fmu/fmu.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
index 7eb78d1389..aaf90c520e 100644
--- a/src/drivers/px4fmu/fmu.cpp
+++ b/src/drivers/px4fmu/fmu.cpp
@@ -1281,11 +1281,7 @@ PX4FMU::cycle()
 	}
 
 	// read all available data from the serial RC input UART
-<<<<<<< f7f406c45de427793c5475eee52f8d318de5b2ee
-	int newBytes = ::read(_rcs_fd, &_rcs_buf[0], sizeof(_rcs_buf) / sizeof(_rcs_buf[0]));
-=======
 	int newBytes = ::read(_rcs_fd, &_rcs_buf[0], SBUS_BUFFER_SIZE);
->>>>>>> Increased SBUS buffer size for more reliable SBUS and DSM parsing
 
 	switch (_rc_scan_state) {
 	case RC_SCAN_SBUS: