| commit | 39e4db135a86cce6c240053d6708c44dabe61866 | [log] [tgz] |
|---|---|---|
| author | Justin Uang <justinuang@google.com> | Mon Sep 23 16:30:22 2019 -0400 |
| committer | Igor Bernstein <igorbernstein@google.com> | Mon Sep 23 21:10:47 2019 +0000 |
| tree | b0befb719b6f1d0f90f756105d0aff61b51b7264 | |
| parent | 25c46dc0295c8abb3558617578c6ada20e5339bf [diff] |
bigtable/cmd/cbt: Fix tab/space merge conflict Change-Id: I20a07aefff874398ea35c2df246cef18c110099f Reviewed-on: https://code-review.googlesource.com/c/gocloud/+/45870 Reviewed-by: Ramesh Dharan <dharan@google.com> Reviewed-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Igor Bernstein <igorbernstein@google.com>
diff --git a/bigtable/cmd/cbt/cbt.go b/bigtable/cmd/cbt/cbt.go index 972feeb..c1ec3ec 100644 --- a/bigtable/cmd/cbt/cbt.go +++ b/bigtable/cmd/cbt/cbt.go
@@ -206,7 +206,7 @@ creds = path-to-account-key.json admin-endpoint = hostname:port data-endpoint = hostname:port - auth-token = AJP... + auth-token = AJAvW039NO1nDcijk_J6_rFXG_... All values are optional, and all will be overridden by flags. `