Cleans up a missed conflict
@@ -26,12 +26,6 @@ description: Documentation for Chef Habitat uploading, auto-building, and deploy
---
<%= partial "/partials/docs/using-builder-create-origin"%>
---
-<<<<<<< HEAD
-<%= partial "/partials/docs/using-builder-origin-keys"%>
----
-<%= partial "/partials/docs/using-builder-access-tokens"%>
----
-=======
## <a name="builder-token" id="builder-token" data-magellan-target="builder-token">Generate an Access Token</a>
You can build and run Chef Habitat packages without authenticating to Builder; however some operations, like uploading your packages to Builder, or checking status of your build jobs from the Chef Habitat client, will require an access token.
@@ -52,7 +46,6 @@ export HAB_AUTH_TOKEN=<token>
Replacing `<token>` with the contents of your generated token.
->>>>>>> Changed 'Habitat' to 'Chef Habitat' in documentation & blog.
<%= partial "/partials/docs/using-builder-origin-secrets"%>
---
<%= partial "/partials/docs/dev-pkgs-share"%>
