public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #4910 from Oliboy50/patch-1 

fix documentation which use a single pipe for a "logical OR"
pull/4908/merge
Rob 2016-02-12 10:15:52 +01:00
parent 6d1ebba75e 71e83bc34f
commit 0117571caa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/04-schema.md
View File

@ -361,7 +361,7 @@ will not be allowed to be installed together with your package.
Note that when specifying ranges like `<1.0 >=1.1` in a `conflict` link, Note that when specifying ranges like `<1.0 >=1.1` in a `conflict` link,
this will state a conflict with all versions that are less than 1.0 *and* equal this will state a conflict with all versions that are less than 1.0 *and* equal
or newer than 1.1 at the same time, which is probably not what you want. You or newer than 1.1 at the same time, which is probably not what you want. You
probably want to go for `<1.0 | >=1.1` in this case. probably want to go for `<1.0 || >=1.1` in this case.
#### replace #### replace