Merge package/published configs

VATSIM-UK · Apr 10, 2017 · 8526d68 · 8526d68
1 parent f5b6c0a
commit 8526d68
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Vatsim/Xml/XmlServiceProvider.php b/src/Vatsim/Xml/XmlServiceProvider.php
@@ -43,9 +43,13 @@ public function register()
 			$this->publishes([
 				$this->dir("config/config.php") => config_path("vatsim-xml.php"),
 			]);
+
+            $this->mergeConfigFrom(
+                __DIR__ . '/../../config/config.php', 'vatsim-xml'
+            );
 		}
 
-		$this->app['vatsimxml'] = $this->app->singleton('vatsimxml', function($app){
+		$this->app->singleton('vatsimxml', function($app){
 			return new XML( $this->app["config"]->get("vatsim-xml") );
 		});
 	}