From ca4603200e8f2e46942bdd9927d2e08406f727cb Mon Sep 17 00:00:00 2001
From: iferreira <iferreira@odoogap.com>
Date: Tue, 10 Sep 2024 20:05:22 -0300
Subject: [PATCH] FIX - updating workflow ci files

---
 .github/workflows/continuous-delivery.yml    | 15 ---------------
 .github/workflows/continuous-integration.yml | 13 -------------
 2 files changed, 28 deletions(-)

diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
index 264a1752..0932a063 100644
--- a/.github/workflows/continuous-delivery.yml
+++ b/.github/workflows/continuous-delivery.yml
@@ -1,18 +1,3 @@
-<<<<<<< HEAD
-name: VSF Continuous Delivery
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - sdk-migration
-      
-jobs:
-  release-packages:
-    name: "Release NPM Packages"
-    uses: vuestorefront/integrations-github-workflows/.github/workflows/continuous-delivery.yml@develop
-    secrets: inherit
-=======
 name: Release
 
 on:
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 6042312a..8cd1541c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -4,21 +4,13 @@ on:
   workflow_call:
     inputs:
       enterprise:
-<<<<<<< HEAD
         description: 'Flag to use enterprise registry'
-=======
-        description: "Flag to use enterprise registry"
->>>>>>> origin/main
         type: boolean
         required: false
         default: false
 
       node_version:
-<<<<<<< HEAD
         description: 'Node versions to test'
-=======
-        description: "Node versions to test"
->>>>>>> origin/main
         type: string
         required: false
         default: "['16']"
@@ -26,11 +18,6 @@ on:
 defaults:
   run:
     shell: bash
-<<<<<<< HEAD
-
-=======
-        
->>>>>>> origin/main
 env:
   GCP_PROJECT_ID: 81559754996
   GCP_PROJECT_NAME: sf-artifacts-prod