Skip to content

Commit ffb0fa1

carbon-cloud-deploy carbon-cloud-deploy

committed

merge conflict with composer.json

2 parents e84f809 + 0d4d7ed commit ffb0fa1Copy full SHA for ffb0fa1

File tree

1 file changed

+1

-1

lines changed

composer.json

1 file changed

+1

-1

lines changed

`‎composer.json`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"require" : {`
`25`	`25`	`"php": ">=7.1",`
`26`	`26`	`"yooper/stop-words": "~1",`
`27`		`- "symfony/console": "~4.0",`
	`27`	`+ "symfony/console": "~4.0 \|\| ~5.0",`
`28`	`28`	`"wamania/php-stemmer": "~1",`
`29`	`29`	`"yooper/nicknames": "~1",`
`30`	`30`	`"vanderlee/php-sentence": "~1.0"`

0 commit comments

Comments

(0)