Commit ba7eeea

committed

Merge branch 'PHP-8.2'

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

2 parents 1a2fdeb + 7c244f5 commit ba7eeeaCopy full SHA for ba7eeea

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)