From 661db4356cf136178ff8cbad128dcb24cbcaaf60 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 1 Apr 2014 22:17:12 +0200
Subject: [PATCH] refs #199, fixed merge issue, overlooked HEAD line

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

diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h
index 5565f7430..e2f1fa55b 100644
--- a/src/blackcore/context_network.h
+++ b/src/blackcore/context_network.h
@@ -62,7 +62,6 @@ namespace BlackCore
         //! Aircraft list has been changed
         void changedAircraftsInRange();
 
-<<<<<<< HEAD
         /*!
          * \brief Aircraft situation update
          * \param callsign