Update developOnPR.yml

fschiozerSFDC · Nov 28, 2023 · 8dfb717 · 8dfb717
1 parent cda3e01
commit 8dfb717
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/developOnPR.yml b/.github/workflows/developOnPR.yml
@@ -8,23 +8,15 @@ on:
 # Jobs to be executed
 jobs:
   build-deploy:
-<<<<<<< HEAD
     runs-on: ubuntu-latest
-=======
-    runs-on: Professiona-Services-LATAM-Ubuntu
->>>>>>> b7d8470 (Initialize develop)
     container: tnascimento013/latam_salesforcedx_industries_orgdevmodebuilds:latest
     environment: build
     steps:
       - name: Installing missing CLIs / Plugins
         run: echo "y" | sf plugins install sf-orgdevmode-builds
 
       - name: Checkout source code
-<<<<<<< HEAD
         uses: actions/checkout@v3
-=======
-        uses: Professiona-Services-LATAM/checkout@v3
->>>>>>> b7d8470 (Initialize develop)
 
       - name: Extracting private key
         run: 'echo "${{ secrets.JWT_KEY_NONPROD }}" > server.key'