chore: Fix merge conflicts, b=no-bug, c=no-component

This commit is contained in:
mr. m
2026-02-15 13:38:00 +01:00
parent 9a6db5fb86
commit c55126085b

View File

@@ -20,11 +20,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
<<<<<<< Updated upstream
"displayVersion": "1.18.7b",
=======
"displayVersion": "1.18.8b",
>>>>>>> Stashed changes
"github": {
"repo": "zen-browser/desktop"
},