From c55126085b4d15f13fdbcea1d1901bc33d350a0a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 15 Feb 2026 13:38:00 +0100
Subject: [PATCH] chore: Fix merge conflicts, b=no-bug, c=no-component

---
 surfer.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/surfer.json b/surfer.json
index 2c9fa42ef..2de24cdbe 100644
--- a/surfer.json
+++ b/surfer.json
@@ -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"
         },