Skip to content

Commit

Permalink
fix: remove conflict markers in Chart.yaml
Browse files Browse the repository at this point in the history
- was causing CI to fail
  • Loading branch information
vadasambar committed Nov 30, 2023
1 parent 00e9632 commit 105d573
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions charts/warm-metal-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
<<<<<<< HEAD
version: 0.7.0
=======
version: 0.8.0
>>>>>>> cbe65e4 (feat: async image pull and mount)

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
<<<<<<< HEAD
appVersion: v0.7.0
=======
appVersion: v0.8.0
>>>>>>> cbe65e4 (feat: async image pull and mount)
appVersion: v0.7.0

0 comments on commit 105d573

Please sign in to comment.