Fix broken test

spatie · Dec 17, 2020 · d776fdb · d776fdb
1 parent 89e1c94
commit d776fdb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tests/EnumTest.php b/tests/EnumTest.php
@@ -82,10 +82,6 @@ public function use_enum_construct_within_an_enum()
  * @method static self A()
  * @method static self B()
  */
-<<<<<<< HEAD
-class MyEnum extends Enum
-{
-=======
 class MyEnum extends Enum {}
 
 /**
@@ -98,5 +94,4 @@ public function test()
     {
         return EnumWithEnum::B();
     }
->>>>>>> Fix issue with enums not callable within enum classes
 }