From 4b5d585e57ba240bd022200550bdc614fdfc8d16 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Wed, 9 Aug 2017 15:16:56 -1000
Subject: [PATCH] kinetis:Add define for PX4_NUMBER_I2C_BUSES

---
 src/platforms/px4_micro_hal.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/platforms/px4_micro_hal.h b/src/platforms/px4_micro_hal.h
index 9fa8e3e299..d506408367 100644
--- a/src/platforms/px4_micro_hal.h
+++ b/src/platforms/px4_micro_hal.h
@@ -178,11 +178,7 @@ __BEGIN_DECLS
  */
 #    define PX4_CPU_MFGUID_BYTE_LENGTH              PX4_CPU_UUID_BYTE_LENGTH
 
-<<<<<<< HEAD
 /* define common formating across all commands */
-=======
-/* define common formating accross all commands */
->>>>>>> Adding Kinetis board common identity to micro hal
 
 #    define PX4_CPU_UUID_WORD32_FORMAT              "%08x"
 #    define PX4_CPU_UUID_WORD32_SEPARATOR           ":"