Commit 2bd58db

committed

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0: Fix pdo_dblib ext test conflicts when run in parallel

2 parents ce1358f + f866295 commit 2bd58dbCopy full SHA for 2bd58db

1 file changed

+1

-0

lines changed

ext/pdo_dblib/tests
- CONFLICTS

1 file changed

+1

-0

lines changed

`‎ext/pdo_dblib/tests/CONFLICTS`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+pdo_dblib`

Comments

(0)