Fix some typos

Signed-off-by: cuishuang <imcusg@gmail.com>
[foka@debian.org: Resolve merge conflict and squash 2 commits]
Signed-off-by: Anthony Fok <foka@debian.org>
This commit is contained in:
cuishuang
2022-03-10 12:01:05 +08:00
committed by Anthony Fok
parent bbd455fe79
commit 48c98a8d24
5 changed files with 5 additions and 5 deletions

View File

@@ -128,7 +128,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
// they are finalized.
collectHook := func(m *modules.ModulesConfig) error {
// We don't need the merge strategy configuration anymore,
// remove it so it doesn't accidentaly show up in other settings.
// remove it so it doesn't accidentally show up in other settings.
l.deleteMergeStrategies()
if err := l.loadLanguageSettings(nil); err != nil {