Skip to content

Commit 1bf91d8

Browse files
authored
fix(chart): Fix conflict and bump chart and images (#991)
Signed-off-by: Javier Rodriguez <[email protected]>
1 parent 4f2abde commit 1bf91d8

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

deployment/chainloop/Chart.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ description: Chainloop is an open source software supply chain control plane, a
77

88
type: application
99
# Bump the patch (not minor, not major) version on each change in the Chart Source code
10-
<<<<<<< HEAD
11-
version: 1.63.1
12-
=======
1310
version: 1.63.2
14-
>>>>>>> b746e75 (Bump chart version adn add comment)
1511
# Do not update appVersion, this is handled automatically by the release process
16-
appVersion: v0.91.8
12+
appVersion: v0.92.0
1713

1814
dependencies:
1915
- name: common

0 commit comments

Comments
 (0)