Commit 67c32cd0 authored by 朱招明's avatar 朱招明

Merge branch 'develop'

parents 04d200e7 8cd84a44
...@@ -31,6 +31,6 @@ class ThirdApiServiceProvider extends ServiceProvider ...@@ -31,6 +31,6 @@ class ThirdApiServiceProvider extends ServiceProvider
*/ */
public function register() public function register()
{ {
$this->mergeConfigFrom(realpath(__DIR__.'/../config/wike.php'), 'wike'); $this->mergeConfigFrom(realpath(__DIR__.'/../config/third_api.php'), 'third_api');
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment