From 1f7bf911b2a50b11a75ba360a0c581cfb728a214 Mon Sep 17 00:00:00 2001
From: Elf Sundae <elf.sundae@gmail.com>
Date: Fri, 13 Oct 2017 21:55:32 +0800
Subject: [PATCH] Merge config file in the service registration

---
 src/TrustedProxyServiceProvider.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/TrustedProxyServiceProvider.php b/src/TrustedProxyServiceProvider.php
index dc299e3..583de2b 100644
--- a/src/TrustedProxyServiceProvider.php
+++ b/src/TrustedProxyServiceProvider.php
@@ -9,11 +9,11 @@
 class TrustedProxyServiceProvider extends ServiceProvider
 {
     /**
-     * Boot the service provider.
+     * Register the service provider.
      *
      * @return void
      */
-    public function boot()
+    public function register()
     {
         $source = realpath(__DIR__.'/../config/trustedproxy.php');
 
@@ -25,14 +25,4 @@ public function boot()
 
         $this->mergeConfigFrom($source, 'trustedproxy');
     }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
 }