From 4fbeb73bda55f14d1ffd259d064e116047b20301 Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Tue, 30 Sep 2014 15:48:48 +0200
Subject: [PATCH] fix merge fail, remove double declaration of circuit breaker

---
 src/modules/systemlib/circuit_breaker.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/modules/systemlib/circuit_breaker.c b/src/modules/systemlib/circuit_breaker.c
index 8ad79f94d6..12187d70ea 100644
--- a/src/modules/systemlib/circuit_breaker.c
+++ b/src/modules/systemlib/circuit_breaker.c
@@ -136,20 +136,6 @@ PARAM_DEFINE_INT32(CBRK_ENGINEFAIL, 284953);
  */
 PARAM_DEFINE_INT32(CBRK_GPSFAIL, 240024);
 
-/**
- * Circuit breaker for gps failure detection
- *
- * Setting this parameter to 240024 will disable the gps failure detection.
- * If the aircraft is in gps failure mode the gps failure flag will be
- * set to healthy
- * WARNING: ENABLING THIS CIRCUIT BREAKER IS AT OWN RISK
- *
- * @min 0
- * @max 240024
- * @group Circuit Breaker
- */
-PARAM_DEFINE_INT32(CBRK_GPSFAIL, 240024);
-
 bool circuit_breaker_enabled(const char* breaker, int32_t magic)
 {
 	int32_t val;