Compilation error fixes following merge with next.

[flightgear.git] / src / Airports / dynamics.hxx

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 3240f09381dcc1708f8f86299544bd1ca9b1716c..d3dbedaa27b50256e600b5215632e7bf0cf1f1a3 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -58,23 +58,15 @@ private:
   intVec freqTower;    // </TOWER>
   intVec freqApproach; // </APPROACH>
 
-<<<<<<< HEAD:src/Airports/dynamics.hxx
-  string atisInformation;
-
-  string chooseRunwayFallback();
-  bool innerGetActiveRunway(const string &trafficType, int action, string &runway, double heading);
-  string chooseRwyByHeading(stringVec rwys, double heading);
-
-    double elevation;
-
-=======
   int atisSequenceIndex;
   double atisSequenceTimeStamp;
   
   std::string chooseRunwayFallback();
   bool innerGetActiveRunway(const std::string &trafficType, int action, std::string &runway, double heading);
   std::string chooseRwyByHeading(stringVec rwys, double heading);
->>>>>>> next:src/Airports/dynamics.hxx
+
+  double elevation;
+
 public:
   FGAirportDynamics(FGAirport* ap);
   ~FGAirportDynamics();