yanmarques / lincable

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