From b5749c12e00baace231a6e4a2729448686bcba09 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Tue, 30 Aug 2016 09:47:15 +0200
Subject: [PATCH] oops

---
 arangod/Agency/AgentConfiguration.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arangod/Agency/AgentConfiguration.cpp b/arangod/Agency/AgentConfiguration.cpp
index 9d5bcbcc5e..572477204c 100644
--- a/arangod/Agency/AgentConfiguration.cpp
+++ b/arangod/Agency/AgentConfiguration.cpp
@@ -491,11 +491,7 @@ bool config_t::merge(VPackSlice const& conf) {
   ss << "Max RAFT interval: ";
   if (_maxPing == 0) { // Command line beats persistence
     if (conf.hasKey(maxPingStr)) {
-<<<<<<< HEAD
-      _maxPing = conf.get(maxPingStr).getNumericValue<double>();
-=======
       _maxPing = conf.get(maxPingStr).getDouble();
->>>>>>> c53428ce893e1684701d8be23a894b221ad4969d
       ss << _maxPing << " (persisted)";
     } else {
       _maxPing = 2.5;