fix: resolve conflicts

bugbuilder · bugbuilder · commit 9b43864ff9e2 · 2024-12-04T15:22:53.000-03:00
Signed-off-by: bugbuilder &lt;nelson@v7n.cl&gt;
diff --git a/addons/fluxcd/definitions/helm-release-def.cue b/addons/fluxcd/definitions/helm-release-def.cue
@@ -133,7 +133,7 @@ template: {
 		}
 		spec: {
 			timeout:  parameter.installTimeout
-			interval: parameter.pullInterval
+			interval: parameter.interval
 			chart: {
 				spec: {
 					chart:   parameter.chart
@@ -155,7 +155,7 @@ template: {
 							name: parameter.sourceName
 						}
 					}
-					interval: parameter.interval
+					interval: parameter.pullInterval
 					if parameter["valuesFiles"] != _|_ {
 						valuesFiles: parameter["valuesFiles"]
 					}

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ template: {`
`133`	`133`	`}`
`134`	`134`	`spec: {`
`135`	`135`	`timeout: parameter.installTimeout`
`136`		`- interval: parameter.pullInterval`
	`136`	`+ interval: parameter.interval`
`137`	`137`	`chart: {`
`138`	`138`	`spec: {`
`139`	`139`	`chart: parameter.chart`
`@@ -155,7 +155,7 @@ template: {`
`155`	`155`	`name: parameter.sourceName`
`156`	`156`	`}`
`157`	`157`	`}`
`158`		`- interval: parameter.interval`
	`158`	`+ interval: parameter.pullInterval`
`159`	`159`	`if parameter["valuesFiles"] != _\|_ {`
`160`	`160`	`valuesFiles: parameter["valuesFiles"]`
`161`	`161`	`}`