From d4e7eee27e91a44f2430664e22bc1948bd1b74dc Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Tue, 10 Apr 2018 13:23:26 -0700 Subject: [PATCH] Fix merge artifacts in vnext branch Signed-off-by: Joffrey F --- compose/compose-file/compose-versioning.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md index cc5adcf877..0c969b51ea 100644 --- a/compose/compose-file/compose-versioning.md +++ b/compose/compose-file/compose-versioning.md @@ -441,23 +441,12 @@ All other keys are ignored and produce a warning if present. You can review the configuration that will be used to deploy by using the `--compatibility` flag with the `config` command. -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> b3a1eb7... Use updated notes format > Do not use this in production! > > We recommend against using `--compatibility` mode in production. Because the > resulting configuration is only an approximate using non-Swarm mode > properties, it may produce unexpected results. -<<<<<<< HEAD -======= -> **Note:** We recommend against using `--compatibility` mode in production. -> Because the resulting configuration is only an approximate using non-Swarm -> mode properties, it may produce unexpected results. ->>>>>>> 93426bb... Document compatibility mode -======= ->>>>>>> b3a1eb7... Use updated notes format + ## Compose file format references