Merge branch '2.x' into 3.x

This commit is contained in:
Nuno Maduro
2024-08-02 23:53:26 +01:00
8 changed files with 47 additions and 4 deletions

View File

@ -1,5 +1,9 @@
<<<<<<< HEAD
Pest Testing Framework 3.0.0-dev-0008.
=======
Pest Testing Framework 2.35.0.
>>>>>>> 2.x
USAGE: pest <file> [options]

View File

@ -1,3 +1,7 @@
<<<<<<< HEAD
Pest Testing Framework 3.0.0-dev-0008.
=======
Pest Testing Framework 2.35.0.
>>>>>>> 2.x