Skip to content

Commit

Permalink
merged main
Browse files Browse the repository at this point in the history
  • Loading branch information
bezhanSalleh committed Nov 6, 2024
1 parent 5cb534a commit b56d36d
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/Trace/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace BezhanSalleh\FilamentExceptions\Trace;

use Iterator;
use ReturnTypeWillChange;

class Parser implements Iterator
{
Expand All @@ -23,11 +22,7 @@ public function parse(): ?array
/**
* {@inheritDoc}
*/
<<<<<<< HEAD
#[ReturnTypeWillChange]
=======
#[\ReturnTypeWillChange]
>>>>>>> main
public function current()
{
// TODO: Implement current() method.
Expand All @@ -36,11 +31,7 @@ public function current()
/**
* {@inheritDoc}
*/
<<<<<<< HEAD
#[ReturnTypeWillChange]
=======
#[\ReturnTypeWillChange]
>>>>>>> main
public function next()
{
// TODO: Implement next() method.
Expand All @@ -49,11 +40,7 @@ public function next()
/**
* {@inheritDoc}
*/
<<<<<<< HEAD
#[ReturnTypeWillChange]
=======
#[\ReturnTypeWillChange]
>>>>>>> main
public function key()
{
// TODO: Implement key() method.
Expand All @@ -62,11 +49,7 @@ public function key()
/**
* {@inheritDoc}
*/
<<<<<<< HEAD
#[ReturnTypeWillChange]
=======
#[\ReturnTypeWillChange]
>>>>>>> main
public function valid()
{
// TODO: Implement valid() method.
Expand All @@ -75,11 +58,7 @@ public function valid()
/**
* {@inheritDoc}
*/
<<<<<<< HEAD
#[ReturnTypeWillChange]
=======
#[\ReturnTypeWillChange]
>>>>>>> main
public function rewind()
{
// TODO: Implement rewind() method.
Expand Down

0 comments on commit b56d36d

Please sign in to comment.