Skip to content

Commit 2d938fb

Browse files
committed
fix github actions merge conflict
1 parent 5b0090d commit 2d938fb

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/content/docs/workers/ci-cd/external-cicd/github-actions.mdx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ To set up your CI/CD:
3434

3535
1. Go to your CI/CD platform and add the following as secrets:
3636

37-
<<<<<<< HEAD
38-
- `CLOUDFLARE_ACCOUNT_ID`: Set to the [Cloudflare account ID](/workers/ci-cd/external-cicd/#cloudflare-account-id) for the account on which you want to deploy your Worker.
39-
- `CLOUDFLARE_API_TOKEN`: Set to the [Cloudflare API token you generated](/workers/ci-cd/external-cicd/#api-token).
40-
=======
4137
- `CLOUDFLARE_ACCOUNT_ID`: Set to the [Cloudflare account ID](#cloudflare-account-id) for the account on which you want to deploy your Worker.
4238
- `CLOUDFLARE_API_TOKEN`: Set to the [Cloudflare API token you generated](#api-token).
43-
>>>>>>> 512d7f3090a82fbd18235a6ab7048a7378feb0e4
4439

4540
:::caution
4641

0 commit comments

Comments
 (0)