mirror of
https://github.com/zen-browser/desktop.git
synced 2026-02-22 03:16:40 +00:00
chore: Fix merge conflicts, b=no-bug, c=no-component
This commit is contained in:
@@ -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"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user