encoding/json: replace "between or" with "between and" in comment

Change-Id: Id19a15f9367de10e08a9ec22a8cb50c58d517906
GitHub-Last-Rev: f413d71c9ad0f2efc0b4811c7188cc2caa9c1de0
GitHub-Pull-Request: golang/go#61701
Reviewed-on: https://go-review.googlesource.com/c/go/+/514976
Reviewed-by: Russ Cox <rsc@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Auto-Submit: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go
index bba57fdf4fb939ad57cd216201d38c37bca1c266..4669a02e2e2f8f23eb0659536552d8f938ae823d 100644 (file)
--- a/src/encoding/json/encode.go
+++ b/src/encoding/json/encode.go
@@ -1168,7 +1168,7 @@ func typeFields(t reflect.Type) structFields {
                                        if count[f.typ] > 1 {
                                                // If there were multiple instances, add a second,
                                                // so that the annihilation code will see a duplicate.
-                                               // It only cares about the distinction between 1 or 2,
+                                               // It only cares about the distinction between 1 and 2,
                                                // so don't bother generating any more copies.
                                                fields = append(fields, fields[len(fields)-1])
                                        }