fix merge conflicts

Author: lpm0073

{{cookiecutter.github_repo_name}}/terraform/environments/modules/wordpress/config/ingress.yml.tpl

@@ -36,15 +36,6 @@ resources:
   requests:
     memory: "128Mi"
     cpu: "12m"
-allowEmptyPassword: ${allowEmptyPassword}
-htaccessPersistenceEnabled: false
-extraVolumes: ${extraVolumes}
-extraVolumeMounts: ${extraVolumeMounts}
-resources:
-  limits: {}
-  requests:
-    memory: 512Mi
-    cpu: 300m
 containerPorts:
   http: 8080
   https: 8443