diff options
Diffstat (limited to 'vendor/github.com/magiconair/properties')
| -rw-r--r-- | vendor/github.com/magiconair/properties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | vendor/github.com/magiconair/properties/properties.go | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vendor/github.com/magiconair/properties/CHANGELOG.md b/vendor/github.com/magiconair/properties/CHANGELOG.md index bf49a13..415b9f8 100644 --- a/vendor/github.com/magiconair/properties/CHANGELOG.md +++ b/vendor/github.com/magiconair/properties/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### Unreleased + + * [PR #16](https://github.com/magiconair/properties/pull/16): Keep gofmt happy + ### [1.7.0](https://github.com/magiconair/properties/tags/v1.7.0) - 20 Mar 2016 * [Issue #10](https://github.com/magiconair/properties/issues/10): Add [LoadURL,LoadURLs,MustLoadURL,MustLoadURLs](http://godoc.org/github.com/magiconair/properties#Properties.LoadURL) method to load properties from a URL. 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 { |