Commit f948f79

committed

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: [skip ci] Add all conflict to curl

2 parents 1dcab8a + af6b413 commit f948f79Copy full SHA for f948f79

1 file changed

+1

-1

lines changed

ext/curl/tests
- CONFLICTS

1 file changed

+1

-1

lines changed

`‎ext/curl/tests/CONFLICTS`

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

Comments

(0)