From 0c376fb65663c206d250e39be6409123ecdddfae Mon Sep 17 00:00:00 2001 From: James Phillips Date: Tue, 18 Jul 2017 07:35:17 -0700 Subject: [PATCH] Removes a merge conflict marker from the ACL guide. --- website/source/docs/guides/acl.html.md | 1 - 1 file changed, 1 deletion(-) diff --git a/website/source/docs/guides/acl.html.md b/website/source/docs/guides/acl.html.md index d7714e86cd..5d76f766fa 100644 --- a/website/source/docs/guides/acl.html.md +++ b/website/source/docs/guides/acl.html.md @@ -172,7 +172,6 @@ key "_rexec" { The `service` policy needs `read` access for any services that can be registered on the agent. If [remote exec is disabled](/docs/agent/options.html#disable_remote_exec), the default, then the `key` policy can be omitted. ->>>>>>> Changes remote exec KV read to call GetTokenForAgent(), which can use #### Bootstrapping ACLs Bootstrapping ACLs on a new cluster requires a few steps, outlined in the example in this