fix lingering merge conflict

ansible/roles/apps/tasks/core.yml

@@ -41,11 +41,11 @@
   #   # Update HelmRelease objects' status with this interval.
   #   --set statusUpdateInterval=30s
   #   # Set resource limits so helm-operator can't take over the whole machine
-  #   --set resources.limits.cpu=1200m \
-  #   --set resources.limits.memory=2Gi \
+  #   --set resources.limits.cpu=1200m
+  #   --set resources.limits.memory=2Gi
   #   # Delay the liveness and readiness probe a bit to prevent restarts
-  #   --set livenessProbe.initialDelaySeconds=10 \
-  #   --set readinessProbe.initialDelaySeconds=10 \
+  #   --set livenessProbe.initialDelaySeconds=10
+  #   --set readinessProbe.initialDelaySeconds=10
   #   # Helm release name
   #   helm-operator
   #   # Chart name
@@ -66,11 +66,8 @@
     --set configureRepositories.repositories[2].url=https://nextcloud.github.io/helm \
     --set chartsSyncInterval=20m \
     --set statusUpdateInterval=30s \
-<<<<<<< HEAD
     --set resources.limits.cpu=1200m \
     --set resources.limits.memory=2Gi \
-=======
->>>>>>> master
     --set livenessProbe.initialDelaySeconds=10 \
     --set readinessProbe.initialDelaySeconds=10 \
     {{ extra_opts }} \