---

elharo · garrettjonesgoogle · commit 673063f06b0c · 2018-04-27T06:55:15.000-07:00
yaml --- r: 9417 b: refs/heads/spanner-gapic-migration c: f0cffb4 h: refs/heads/master i: 9415: b55686c
diff --git a/[refs] b/[refs]
@@ -80,7 +80,7 @@ refs/tags/v0.34.0: bf31760a31a66acb239322a70dcd03dbe1d0c7ca
 refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
 refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
 refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
-refs/heads/spanner-gapic-migration: 41086595b3da90a01ed978d162a714189546f43d
+refs/heads/spanner-gapic-migration: f0cffb4be667573ea5dd8779f554d5e6841f2f49
 refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
 refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
 refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec
diff --git a/branches/spanner-gapic-migration/TROUBLESHOOTING.md b/branches/spanner-gapic-migration/TROUBLESHOOTING.md
@@ -52,7 +52,7 @@ There may be multiple sources for classpath conflicts:
 
 For example, if you have a direct or a transitive dependency on Guava version 10.0, and also `google-cloud-java` uses Guava version 20.0, then `google-cloud-java` could be using Guava methods that don't exist in Guava 10.0, and could cause `NoSuchMethodError`.
 
-Similarily, if your classpath has an older version of `protobuf-java`, but `google-cloud-java` requires newer version, then you may see `NoClassDefFoundError` that fails to initialize `google-cloud-java` classes, e.g.:
+Similarily, if your classpath has an older version of `protobuf-java`, but `google-cloud-java` requires a newer version, then you may see `NoClassDefFoundError` that fails to initialize `google-cloud-java` classes, e.g.:
 
 ```
 java.lang.NoClassDefFoundError: Could not initialize class com.google.pubsub.v1.PubsubMessage$AttributesDefaultEntryHolder
@@ -72,7 +72,7 @@ If you experience the error only during runtime, then it means that your runtime
 
 ### Detecting the conflict early during build
 
-To detect dependnecy version conflicts early, use the [Enforcer Plugin](https://maven.apache.org/enforcer/maven-enforcer-plugin/index.html) in your Maven configuration to enforce dependency convergence:
+To detect dependency version conflicts early, use the [Enforcer Plugin](https://maven.apache.org/enforcer/maven-enforcer-plugin/index.html) in your Maven configuration to enforce dependency convergence:
 
 ```
 <plugin>
