Anonymous

diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index 4f6bbcc..8f28e5a 100644
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -156,8 +156,12 @@ FGNavRadio::FGNavRadio(SGPropertyNode *node) :
     _name(node->getStringValue("name", "nav")),
     _num(node->getIntValue("number", 0)),
     _time_before_search_sec(-1.0),
+<<<<<<< HEAD:src/Instrumentation/navradio.cxx
+    _falseCoursesEnabled(true)
+=======
     _falseCoursesEnabled(true),
     _sgr(NULL)
+>>>>>>> 2ae94086a0d7dfea110064e11821d35acf7685ba:src/Instrumentation/navradio.c
 {
     SGPath path( globals->get_fg_root() );
     SGPath term = path;
@@ -837,6 +841,18 @@ void FGNavRadio::updateAudio()
   play_count = ++play_count % NUM_IDENT_SLOTS;

   // Previous ident is out of time;  if still playing, cut it off:
+<<<<<<< HEAD:src/Instrumentation/navradio.cxx
+  globals->get_soundmgr()->stop( nav_fx_name );
+  globals->get_soundmgr()->stop( dme_fx_name );
: