diff -r 8f478162d991 -r 05c40b36d3b2 vendor/github.com/magiconair/properties/properties.go --- a/vendor/github.com/magiconair/properties/properties.go Thu Sep 22 16:37:07 2022 +0200 +++ b/vendor/github.com/magiconair/properties/properties.go Sat Feb 04 12:58:35 2023 +0100 @@ -1,4 +1,4 @@ -// Copyright 2018 Frank Schroeder. All rights reserved. +// Copyright 2013-2022 Frank Schroeder. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -700,22 +700,17 @@ // Merge merges properties, comments and keys from other *Properties into p func (p *Properties) Merge(other *Properties) { + for _, k := range other.k { + if _, ok := p.m[k]; !ok { + p.k = append(p.k, k) + } + } for k, v := range other.m { p.m[k] = v } for k, v := range other.c { p.c[k] = v } - -outer: - for _, otherKey := range other.k { - for _, key := range p.k { - if otherKey == key { - continue outer - } - } - p.k = append(p.k, otherKey) - } } // ----------------------------------------------------------------------------