rebase

Author: TomasVotruba

config/set/php85.php

@@ -16,14 +16,8 @@
 use Rector\Php85\Rector\FuncCall\ChrArgModuloRector;
 use Rector\Php85\Rector\FuncCall\OrdSingleByteRector;
 use Rector\Php85\Rector\FuncCall\RemoveFinfoBufferContextArgRector;
-<<<<<<< HEAD
-<<<<<<< HEAD
 use Rector\Php85\Rector\ShellExec\ShellExecFunctionCallOverBackticksRector;
-=======
 use Rector\Php85\Rector\StmtsAwareInterface\NestedToPipeOperatorRector;
->>>>>>> 647c058cfc (pipe)
-=======
->>>>>>> 07955913ad (init)
 use Rector\Php85\Rector\Switch_\ColonAfterSwitchCaseRector;
 use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector;
 use Rector\Removing\Rector\FuncCall\RemoveFuncCallRector;
@@ -50,14 +44,8 @@
             SleepToSerializeRector::class,
             OrdSingleByteRector::class,
             WakeupToUnserializeRector::class,
-<<<<<<< HEAD
-<<<<<<< HEAD
             ShellExecFunctionCallOverBackticksRector::class,
-=======
             NestedToPipeOperatorRector::class,
->>>>>>> 647c058cfc (pipe)
-=======
->>>>>>> 07955913ad (init)
         ]
     );
 

src/ValueObject/PhpVersionFeature.php

@@ -836,7 +836,6 @@ final class PhpVersionFeature
     public const DEPRECATE_ORD_WITH_MULTIBYTE_STRING = PhpVersion::PHP_85;
 
     /**
-<<<<<<< HEAD
      * @see https://wiki.php.net/rfc/property-hooks
      * @var int
      */
@@ -847,10 +846,10 @@ final class PhpVersionFeature
      * @var int
      */
     public const DEPRECATE_BACKTICKS = PhpVersion::PHP_85;
-=======
+
+    /**
      * @see https://wiki.php.net/rfc/pipe-operator-v3
      * @var int
      */
     public const PIPE_OPERATOER = PhpVersion::PHP_85;
->>>>>>> 278836226b (pipe)
 }