Skip to content

Commit 430e0b4

samsonasik samsonasik

authored

Remove conflict in composer.json (#34)

1 parent d7c525e commit 430e0b4Copy full SHA for 430e0b4

File tree

1 file changed

+1

-2

lines changed

composer.json

1 file changed

+1

-2

lines changed

`‎composer.json‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@`
`38`	`38`	`"phpunit/phpunit": "^10.5 \|\| ^11.4"`
`39`	`39`	`},`
`40`	`40`	`"conflict": {`
`41`		`- "codeigniter/framework": "*",`
`42`		`- "codeigniter4/framework": "<4.5"`
	`41`	`+ "codeigniter/framework": "*"`
`43`	`42`	`},`
`44`	`43`	`"minimum-stability": "dev",`
`45`	`44`	`"prefer-stable": true,`

0 commit comments

Comments

(0)