Skip to content

Commit e3c1a37

Browse files
committed
fix(docs): remove rebase fail
1 parent 20e50b9 commit e3c1a37

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

pages/serverless-jobs/concepts.mdx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,7 @@ These functions automatically scale based on demand and are designed to be light
7474

7575
## Serverless Jobs
7676

77-
<<<<<<< HEAD:pages/serverless-jobs/concepts.mdx
7877
Serverless Jobs are similar to Serverless Containers but are better suited for running longer workloads. See [the comparison between Serverless products](/serverless-jobs/reference-content/difference-jobs-functions-containers) for more information.
79-
=======
80-
Serverless Jobs are similar to Serverless Containers but are better suited for running longer workloads. See [the comparison between Serverless products](/serverless/jobs/reference-content/difference-jobs-functions-containers) for more information.
81-
>>>>>>> b19395d4f (Apply suggestions from code review):serverless/jobs/concepts.mdx
8278

8379
## Secrets reference
8480

0 commit comments

Comments
 (0)