Commit 7c244f5

committed

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: [skip ci] Add CONFLICTS file for curl tests

2 parents 57442f8 + 0842b13 commit 7c244f5Copy full SHA for 7c244f5

1 file changed

+1

-0

lines changed

ext/curl/tests
- CONFLICTS

1 file changed

+1

-0

lines changed

`‎ext/curl/tests/CONFLICTS`

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

Comments

(0)