manuelblanch / inventory

src/Providers/InventoryServiceProvider.php

Doc Comments +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Unused Use Statements +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Indentation +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Switch Indentation +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Spacing +3 added lines, -6 removed lines

@@ -20,9 +20,9 @@ 
     public function register()
     {
         if (!defined('SCOOL_INVENTORY_PATH')) {
-            define('SCOOL_INVENTORY_PATH', realpath(__DIR__.'/../../'));
+            define('SCOOL_INVENTORY_PATH', realpath(__DIR__ . '/../../'));
         }
-<<<<<<< HEAD
+<< << <<< HEAD
         $this->registerNamesServiceProvider();
         $this->registerStatefulEloquentServiceProvider();
         $this->bindRepositories();
@@ -156,7 +156,4 @@ 
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Braces +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -4 removed lines

@@ -156,7 +156,4 @@
 
     private function registerStatefulEloquentServiceProvider()
     {
-        $this->app->register(StatefulServiceProvider::class);
-    }
->>>>>>> af3b7660d20378ee776d8126fd76cd529a6c647e
-}
+        $this->app
\ No newline at end of file