Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/merge-v1.15.1'
Browse files Browse the repository at this point in the history
Manual merge due to conflict in dependency versions.

Signed-off-by: Mark Yen <[email protected]>
  • Loading branch information
mook-as committed Aug 13, 2024
2 parents 172dd68 + f6caf13 commit b31af30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "rancher-desktop",
"productName": "Rancher Desktop",
"license": "Apache-2.0",
"version": "1.15.0",
"version": "1.15.1",
"author": {
"name": "SUSE",
"email": "[email protected]"
Expand Down

0 comments on commit b31af30

Please sign in to comment.