Update GeoIPServiceProvider.php

Torann · web-flow · commit 8118fda9e92d · 2018-09-21T13:09:33.000-04:00
diff --git a/src/GeoIPServiceProvider.php b/src/GeoIPServiceProvider.php
@@ -21,10 +21,8 @@ public function register()
         }
 
         if ($this->isLumen() === false) {
-            $configPath = __DIR__ . '/../config/geoip.php';
-            $this->mergeConfigFrom($configPath, 'geoip');
+            $this->mergeConfigFrom(__DIR__ . '/../config/geoip.php', 'geoip');
         }
-
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,8 @@ public function register()`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if ($this->isLumen() === false) {`
`24`		`- $configPath = __DIR__ . '/../config/geoip.php';`
`25`		`- $this->mergeConfigFrom($configPath, 'geoip');`
	`24`	`+ $this->mergeConfigFrom(__DIR__ . '/../config/geoip.php', 'geoip');`
`26`	`25`	`}`
`27`		`-`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`/**`