From 2f2a2350e493ba37f2d1950258e57952aef77aaa Mon Sep 17 00:00:00 2001
From: jwellbelove <john.wellbelove@raymarine.com>
Date: Fri, 3 Mar 2017 10:14:44 +0000
Subject: [PATCH] Removed git conflict marker

---
 src/algorithm.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/algorithm.h b/src/algorithm.h
index 73fb21c2..58e05eb1 100644
--- a/src/algorithm.h
+++ b/src/algorithm.h
@@ -695,7 +695,6 @@ namespace etl
     }
 
     return std::pair<TDestinationTrue, TDestinationFalse>(destination_true, destination_false);
->>>>>>> origin/development
   }
 }