Fix merge errors

file/include/simdata/simdataXP.h

@@ -16,16 +16,22 @@ namespace file
 {
   namespace simdata
   {
-    int scan(const std::string defaultFile,
-             const std::string sceneryPack,
-             const std::string logFile,
-             SimDatabase &airports);
+    int scan(
+        const std::string defaultFile,
+        const std::string sceneryPack,
+        const std::string logFile,
+        std::map<std::string,
+                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+            &airports);
 
-    void makeAirport(const std::string &kind,
-                     std::ifstream &infile,
-                     SimDatabase &airports,
-                     std::ofstream &logfile);
-    void makeGate15(std::vector<Gate> &gates,
+    void makeAirport(
+        const std::string &kind,
+        std::ifstream &infile,
+        std::map<std::string,
+                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+            &airports,
+        std::ofstream &logfile);
+    void makeGate15(std::vector<const Gate> &gates,
                     const std::vector<std::string> &fields);
     void makeRunway(std::vector<const Runway> &runways,
                     const std::vector<std::string> &fields);