Resolving Conflicts

VERSION.json

@@ -1,9 +1,4 @@
 {
-<<<<<<< HEAD
-    "version": "4.13.1",
-    "stage": "rc1"
-=======
     "version": "4.14.0",
     "stage": "alpha0"
->>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
 }

wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml

@@ -32,11 +32,7 @@ spec:
             secretName: dashboard-certs
       containers:
         - name: wazuh-dashboard
-<<<<<<< HEAD
-          image: 'wazuh/wazuh-dashboard:4.13.1'
-=======
           image: 'wazuh/wazuh-dashboard:4.14.0'
->>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
           resources:
             limits:
               cpu: 500m

wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml

@@ -63,11 +63,7 @@ spec:
             privileged: true
       containers:
         - name: wazuh-indexer
-<<<<<<< HEAD
-          image: 'wazuh/wazuh-indexer:4.13.1'
-=======
           image: 'wazuh/wazuh-indexer:4.14.0'
->>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
           resources:
             limits:
               cpu: 500m

wazuh/wazuh_managers/wazuh-master-sts.yaml

@@ -41,11 +41,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-<<<<<<< HEAD
-          image: 'wazuh/wazuh-manager:4.13.1'
-=======
           image: 'wazuh/wazuh-manager:4.14.0'
->>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
           resources:
             limits:
               cpu: 400m

wazuh/wazuh_managers/wazuh-worker-sts.yaml

@@ -48,11 +48,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-<<<<<<< HEAD
-          image: 'wazuh/wazuh-manager:4.13.1'
-=======
           image: 'wazuh/wazuh-manager:4.14.0'
->>>>>>> 8bfb3f1ac926da3f2fbe4c37ee38079a1db0a58a
           resources:
             limits:
               cpu: 400m