From dc39331ea1b703db70373ec2de6d7456b6b55f7f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 5 Jun 2018 10:08:11 -0400 Subject: [PATCH] Removing HEAD --- docs/src/main/asciidoc/spring-cloud-commons.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index 48dbfa97..c7355258 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -21,7 +21,6 @@ Spring Cloud builds on top of that and adds a few features that probably all com === The Bootstrap Application Context -<<<<<<< HEAD A Spring Cloud application operates by creating a "`bootstrap`" context, which is a parent context for the main application. It is responsible for loading configuration properties from the external sources and for decrypting properties in the local external configuration files. The two contexts share an `Environment`, which is the source of external properties for any Spring application.