Skip to content

Commit

Permalink
Polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrannen committed Dec 13, 2019
1 parent 47b18e5 commit 17edbec
Showing 1 changed file with 1 addition and 3 deletions.
Expand Up @@ -469,9 +469,7 @@ public void merge(ConfigurableEnvironment parent) {
if (!ObjectUtils.isEmpty(parentDefaultProfiles)) {
synchronized (this.defaultProfiles) {
this.defaultProfiles.remove(RESERVED_DEFAULT_PROFILE_NAME);
for (String profile : parentDefaultProfiles) {
this.defaultProfiles.add(profile);
}
Collections.addAll(this.defaultProfiles, parentDefaultProfiles);
}
}
}
Expand Down

0 comments on commit 17edbec

Please sign in to comment.