Commit b22758d

committed

Merge branch 'PHP-8.2'

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

2 parents 360e6f8 + f948f79 commit b22758dCopy full SHA for b22758d

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)