wip

driesvints · driesvints · commit 6c105348d007 · 2022-01-10T16:31:01.000+01:00
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -1663,12 +1663,7 @@ public function offsetSet($key, $value)
     /**
      * Unset the item at a given offset.
      *
-     * <<<<<<< HEAD
-     *
      * @param  TKey  $key
-     *                     =======
-     * @param  mixed  $key
-     *                      >>>>>>> 8.x
      * @return void
      */
     #[\ReturnTypeWillChange]
