Skip to content

Commit 7420329

Browse files
committed
Fix merge conflict in IpAddressDetails.php
- Remove merge conflict marker <<<<<<< HEAD - Clean up code formatting - Address code review feedback
1 parent 614358c commit 7420329

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/App/Http/Traits/IpAddressDetails.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function checkIP($ip = null, $purpose = 'location', $deep_detect =
3838
'NA' => 'North America',
3939
'SA' => 'South America',
4040
];
41-
<<<<<<< HEAD
41+
4242
if (config('LaravelLogger.enableGeoPlugin', true) && filter_var($ip, FILTER_VALIDATE_IP) && in_array($purpose, $support)) {
4343
$geopluginUrl = config('LaravelLogger.geoPluginUrl', 'http://www.geoplugin.net/json.gp?ip=');
4444
$ipdat = @json_decode(file_get_contents($geopluginUrl.$ip));

0 commit comments

Comments
 (0)