Update extends.md

Just corrected a missing 'and'
This commit is contained in:
Joe Lemmer 2016-11-22 20:12:14 +00:00 committed by GitHub
parent 28d97648cc
commit 07fdd239c7
1 changed files with 2 additions and 2 deletions

View File

@ -267,7 +267,7 @@ common configuration:
## Adding and overriding configuration
Compose copies configurations from the original service over to the local one.
If a configuration option is defined in both the original service the local
If a configuration option is defined in both the original service and the local
service, the local value *replaces* or *extends* the original value.
For single-value options like `image`, `command` or `mem_limit`, the new value