Commit f0eb642

committed

Merge branch 'PHP-7.4'

* PHP-7.4: Prevent further potential test conflicts

2 parents 5b7575e + 2244a7d commit f0eb642Copy full SHA for f0eb642

1 file changed

+1

-0

lines changed

ext/pdo_odbc/tests
- CONFLICTS

1 file changed

+1

-0

lines changed

`‎ext/pdo_odbc/tests/CONFLICTS`

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

Comments

(0)