Merge pull request #20 from nonoesp/master

Add mergeConfigFrom to Provider to make publishing config optional.
vtalbot · Sep 18, 2015 · 051fec3 · 051fec3
2 parents 72c3d56 + 74e8591
commit 051fec3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/VTalbot/Markdown/MarkdownServiceProvider.php b/src/VTalbot/Markdown/MarkdownServiceProvider.php
@@ -26,6 +26,8 @@ public function register()
             __DIR__.'/../../config/config.php' => config_path('markdown.php'),
         ]);
 
+        $this->mergeConfigFrom(__DIR__.'/../../config/config.php', 'markdown');
+
         $this->registerRoutes();
         $this->registerEngineResolver();
         $this->registerMarkdownFinder();