Commit 9e51b48

committed

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4: Add CONFLICTS file for PDO firebird tests

2 parents 8294ad3 + 896e4d3 commit 9e51b48Copy full SHA for 9e51b48

1 file changed

+1

-0

lines changed

ext/pdo_firebird/tests
- CONFLICTS

1 file changed

+1

-0

lines changed

`‎ext/pdo_firebird/tests/CONFLICTS`

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

Comments

(0)