Skip to content

Commit 502c630

Browse files
cmb69cmb69
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix oci8/pdo_oci random test failures when run in parallel
2 parents afc5ab4 + be4dd60 commit 502c630

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

‎ext/oci8/tests/CONFLICTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oci8

‎ext/pdo_oci/tests/CONFLICTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oci8

0 commit comments

Comments
 (0)