flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #199, fixed merge issue, overlooked HEAD line

Browse Source
This commit is contained in:
Klaus Basan
2014-04-01 22:17:12 +02:00
parent 679b34c7f4
commit 661db4356c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context_network.h
View File

@@ -62,7 +62,6 @@ namespace BlackCore
//! Aircraft list has been changed //! Aircraft list has been changed
void changedAircraftsInRange(); void changedAircraftsInRange();
<<<<<<< HEAD
/*! /*!
* \brief Aircraft situation update * \brief Aircraft situation update
* \param callsign * \param callsign