Apply suggestion from @QuentinBisson

Signed-off-by: Quentin Bisson <quentin.bisson@gmail.com>
Signed-off-by: QuentinBisson <quentin@giantswarm.io>

Author: QuentinBisson

charts/loki/templates/_keda.tpl

@@ -37,15 +37,11 @@ spec:
   minReplicaCount: {{ $component.kedaAutoscaling.minReplicas }}
   maxReplicaCount: {{ $component.kedaAutoscaling.maxReplicas }}
   pollingInterval: {{ coalesce $component.kedaAutoscaling.pollingInterval .Values.defaults.kedaAutoscaling.pollingInterval }}
-<<<<<<< Updated upstream
-  cooldownPeriod: {{ coalesce $component.kedaAutoscaling.cooldownPeriod .Values.defaults.kedaAutoscaling.cooldownPeriod }}
-=======
   {{- if kindIs "int" $component.kedaAutoscaling.cooldownPeriod }}
   cooldownPeriod: {{ $component.kedaAutoscaling.cooldownPeriod }}
   {{- else }}
   cooldownPeriod: {{ .Values.defaults.kedaAutoscaling.cooldownPeriod }}
   {{- end }}
->>>>>>> Stashed changes
   {{- with $component.kedaAutoscaling.fallback }}
   fallback:
     {{- toYaml . | nindent 4 }}