fix build

localstack · Nov 16, 2023 · 12450db · 12450db
1 parent a0b18f0
commit 12450db
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/content/en/user-guide/ci/circle-ci/index.md b/content/en/user-guide/ci/circle-ci/index.md
@@ -70,11 +70,7 @@ The above CircleCI job does the following:
 
 To enable LocalStack Pro+, you need to add your LocalStack CI API key to the project's environment variables. The LocalStack container will automatically pick it up and activate the licensed features. 
 
-<<<<<<< HEAD
-Go to the [API Key Settings](https://app.localstack.cloud/account/apikeys) page and copy your CI key. To add the CI key to your CircleCI project, follow these steps:
-=======
 Go to the [CI Key Page](https://app.localstack.cloud/workspace/ci-keys) page and copy your CI key. To add the CI key to your CircleCI project, follow these steps:
->>>>>>> af3fb0383 (PR changes)
 
 - Click on **Project Settings**.
 - Select **Environment Variables** from the left side menu.