yanmarques / lincable

src/Lincable/Eloquent/Lincable.php

Indentation +1 added lines, -3 removed lines

@@ -142,6 +142,4 @@
         });
 
         // Re-set the original fillables.
-        $this->fillable($originalFillables);
-    }
-}
+        $this->fillable($originalFillables
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -142,6 +142,4 @@
         });
 
         // Re-set the original fillables.
-        $this->fillable($originalFillables);
-    }
-}
+        $this->fillable($originalFillables
\ No newline at end of file

Spacing +2 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 namespace Lincable\Eloquent;
 
 use Illuminate\Http\File;
-<<<<<<< HEAD
+<< << <<< HEAD
 =======
 use Lincable\UrlGenerator;
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
@@ -142,6 +142,4 @@ 
         });
 
         // Re-set the original fillables.
-        $this->fillable($originalFillables);
-    }
-}
+        $this->fillable($originalFillables
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -142,6 +142,4 @@
         });
 
         // Re-set the original fillables.
-        $this->fillable($originalFillables);
-    }
-}
+        $this->fillable($originalFillables
\ No newline at end of file

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

@@ -142,6 +142,4 @@
         });
 
         // Re-set the original fillables.
-        $this->fillable($originalFillables);
-    }
-}
+        $this->fillable($originalFillables
\ No newline at end of file

src/Lincable/Providers/MediaManagerServiceProvider.php

Indentation +1 added lines, -13 removed lines

@@ -50,16 +50,4 @@
 =======
         
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-        $this->app['events']->subscribe($this->app['config']['lincable.upload_subscriber']);
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [MediaManager::class];
-    }
-}
+        $this->app['events']->subscribe($this->app
\ No newline at end of file

Switch Indentation +1 added lines, -13 removed lines

@@ -50,16 +50,4 @@
 =======
         
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-        $this->app['events']->subscribe($this->app['config']['lincable.upload_subscriber']);
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [MediaManager::class];
-    }
-}
+        $this->app['events']->subscribe($this->app
\ No newline at end of file

Spacing +2 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
     public function boot()
     {
         $configPath = __DIR__.'/../../../config/lincable.php';
-<<<<<<< HEAD
+<< << <<< HEAD
 
 =======
         
@@ -50,16 +50,4 @@ 
 =======
         
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-        $this->app['events']->subscribe($this->app['config']['lincable.upload_subscriber']);
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [MediaManager::class];
-    }
-}
+        $this->app['events']->subscribe($this->app
\ No newline at end of file

Braces +1 added lines, -13 removed lines

@@ -50,16 +50,4 @@
 =======
         
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-        $this->app['events']->subscribe($this->app['config']['lincable.upload_subscriber']);
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [MediaManager::class];
-    }
-}
+        $this->app['events']->subscribe($this->app
\ No newline at end of file

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

@@ -50,16 +50,4 @@
 =======
         
 >>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-        $this->app['events']->subscribe($this->app['config']['lincable.upload_subscriber']);
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [MediaManager::class];
-    }
-}
+        $this->app['events']->subscribe($this->app
\ No newline at end of file

config/lincable.php

Indentation -9 removed lines

@@ -116,12 +116,3 @@
             \Lincable\Formatters\MonthFormatter::class,
             \Lincable\Formatters\RandomFormatter::class,
 <<<<<<< HEAD
-            \Lincable\Formatters\TimestampsFormatter::class,
-        ],
-    ],
-=======
-            \Lincable\Formatters\TimestampsFormatter::class
-        ]
-    ]
->>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-];

Switch Indentation -9 removed lines

@@ -116,12 +116,3 @@
             \Lincable\Formatters\MonthFormatter::class,
             \Lincable\Formatters\RandomFormatter::class,
 <<<<<<< HEAD
-            \Lincable\Formatters\TimestampsFormatter::class,
-        ],
-    ],
-=======
-            \Lincable\Formatters\TimestampsFormatter::class
-        ]
-    ]
->>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-];

Spacing +1 added lines, -10 removed lines

@@ -115,13 +115,4 @@
             \Lincable\Formatters\DayFormatter::class,
             \Lincable\Formatters\MonthFormatter::class,
             \Lincable\Formatters\RandomFormatter::class,
-<<<<<<< HEAD
-            \Lincable\Formatters\TimestampsFormatter::class,
-        ],
-    ],
-=======
-            \Lincable\Formatters\TimestampsFormatter::class
-        ]
-    ]
->>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-];
+<< << <<< HEAD

Braces -9 removed lines

@@ -116,12 +116,3 @@
             \Lincable\Formatters\MonthFormatter::class,
             \Lincable\Formatters\RandomFormatter::class,
 <<<<<<< HEAD
-            \Lincable\Formatters\TimestampsFormatter::class,
-        ],
-    ],
-=======
-            \Lincable\Formatters\TimestampsFormatter::class
-        ]
-    ]
->>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-];

Upper-Lower-Casing -9 removed lines

@@ -116,12 +116,3 @@
             \Lincable\Formatters\MonthFormatter::class,
             \Lincable\Formatters\RandomFormatter::class,
 <<<<<<< HEAD
-            \Lincable\Formatters\TimestampsFormatter::class,
-        ],
-    ],
-=======
-            \Lincable\Formatters\TimestampsFormatter::class
-        ]
-    ]
->>>>>>> 4c8a26f5a973bebf5b69c343119e2161a489f17b
-];