Update .github/workflows/serverless-project.yml

Author: v1v

.github/workflows/serverless-project.yml

@@ -75,11 +75,7 @@ jobs:
           project-id: "elastic-observability-ci"
 
       - name: Set up Cloud SDK
-<<<<<<< HEAD
-        uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a
-=======
         uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db  # v3.0.1
->>>>>>> 66a39efd9 (build(deps): bump google-github-actions/setup-gcloud from 3.0.0 to 3.0.1 (#9662))
 
       # TODO: as soon as the oblt-framework supports elastic-observability-ci we can avoid this step.
       # NOTE: