aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/magiconair/properties/properties.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/magiconair/properties/properties.go')
-rw-r--r--vendor/github.com/magiconair/properties/properties.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/magiconair/properties/properties.go b/vendor/github.com/magiconair/properties/properties.go
index e7e0104..50209d8 100644
--- a/vendor/github.com/magiconair/properties/properties.go
+++ b/vendor/github.com/magiconair/properties/properties.go
@@ -632,14 +632,14 @@ func (p *Properties) Delete(key string) {
// Merge merges properties, comments and keys from other *Properties into p
func (p *Properties) Merge(other *Properties) {
- for k,v := range other.m {
+ for k, v := range other.m {
p.m[k] = v
}
- for k,v := range other.c {
+ for k, v := range other.c {
p.c[k] = v
}
- outer:
+outer:
for _, otherKey := range other.k {
for _, key := range p.k {
if otherKey == key {