Add missing merge code

ministryofjustice · Nov 8, 2024 · 7b4c4b8 · 7b4c4b8
1 parent 84dee68
commit 7b4c4b8
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/helm_deploy/wordpress/templates/deployment.yaml b/helm_deploy/wordpress/templates/deployment.yaml
@@ -80,13 +80,8 @@ spec:
               cpu: {{ index .Values.nginx.resources .Values.configmap.envtype "requests" "cpu" }}
               memory: {{ index .Values.nginx.resources .Values.configmap.envtype "requests" "memory" }}
             limits:
-<<<<<<< HEAD
-              cpu: {{ index .Values.nginx.resources .Values.configmap.envtype "requests" "cpu" }}
-              memory: {{ index .Values.nginx.resources .Values.configmap.envtype "requests" "memory" }}
-=======
               cpu: {{ index .Values.nginx.resources .Values.configmap.envtype "limits" "cpu" }}
               memory: {{ index .Values.nginx.resources .Values.configmap.envtype "limits" "memory" }}
->>>>>>> memory-allocation
           ports:
             - containerPort: 8080
           volumeMounts: