diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2016-12-28 21:18:36 +0000 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2016-12-28 21:18:36 +0000 |
| commit | 73ef85bc5db590c22689e11be20737a3dd88168f (patch) | |
| tree | fe393a6f0776bca1889b2113ab341a2922e25d10 /vendor/github.com/magiconair/properties/properties.go | |
| parent | 9e573e571fe878ed32947cae5a6d43cb5d72d3bb (diff) | |
Update dependencies
Diffstat (limited to 'vendor/github.com/magiconair/properties/properties.go')
| -rw-r--r-- | vendor/github.com/magiconair/properties/properties.go | 6 |
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 { |