Merge pull request kubernetes#18985 from mlafeldt/patch-1

Auto commit by PR queue bot
madhusudancs · Dec 22, 2015 · 0588963 · 0588963
2 parents 9168a5c + 1701cd4
commit 0588963
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/util/yaml/decoder.go b/pkg/util/yaml/decoder.go
@@ -29,8 +29,8 @@ import (
 
 // ToJSON converts a single YAML document into a JSON document
 // or returns an error. If the document appears to be JSON the
-// YAML decoding path is not used (so that error messages are)
-// JSON specific.
+// YAML decoding path is not used (so that error messages are
+// JSON specific).
 func ToJSON(data []byte) ([]byte, error) {
 	if hasJSONPrefix(data) {
 		return data, nil