gotypes: even minorer fixes
Change-Id: Iba181e26e4c6ee298666983613120f8845f6e7aa
Reviewed-on: https://go-review.googlesource.com/17973
Reviewed-by: Robert Griesemer <gri@golang.org>
diff --git a/gotypes/README.md b/gotypes/README.md
index 86c9674..91ac5c7 100644
--- a/gotypes/README.md
+++ b/gotypes/README.md
@@ -401,7 +401,7 @@
Not all methods make sense for each kind of object. For instance,
the last four kinds above have no meaningful `Type` method.
-And some kinds of object have methods in addition to those required by the
+And some kinds of objects have methods in addition to those required by the
`Object` interface:
@@ -885,7 +885,7 @@
-The table below summarizes which kinds of object may be declared at
+The table below summarizes which kinds of objects may be declared at
each level of the tree of lexical blocks.
@@ -954,7 +954,6 @@
That is, any topological order of the import graph will do.
The `(*Package).Imports` method returns the set of direct
dependencies of a package.
->>>>>>> 637ffe0981073879a95f848fd9528efe9231bed9
# Types
diff --git a/gotypes/go-types.md b/gotypes/go-types.md
index b13e7e7..94ac90b 100644
--- a/gotypes/go-types.md
+++ b/gotypes/go-types.md
@@ -318,7 +318,7 @@
Not all methods make sense for each kind of object. For instance,
the last four kinds above have no meaningful `Type` method.
-And some kinds of object have methods in addition to those required by the
+And some kinds of objects have methods in addition to those required by the
`Object` interface:
@@ -704,7 +704,7 @@
-The table below summarizes which kinds of object may be declared at
+The table below summarizes which kinds of objects may be declared at
each level of the tree of lexical blocks.
@@ -773,7 +773,6 @@
That is, any topological order of the import graph will do.
The `(*Package).Imports` method returns the set of direct
dependencies of a package.
->>>>>>> 637ffe0981073879a95f848fd9528efe9231bed9
# Types
