yanmarques / lincable

src/Lincable/Eloquent/Lincable.php

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

src/Lincable/Providers/MediaManagerServiceProvider.php

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

config/lincable.php

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
-];