From fe5033ea6da93fd26be163258d0b5597111dd492 Mon Sep 17 00:00:00 2001
From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com>
Date: Sun, 22 Feb 2026 09:00:45 -0700
Subject: [PATCH] Update talk and own names in Zoitechat JSON

---
 flatpak/net.zoite.Zoitechat.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json
index 2266c245..b7436edd 100644
--- a/flatpak/net.zoite.Zoitechat.json
+++ b/flatpak/net.zoite.Zoitechat.json
@@ -19,14 +19,9 @@
     "--filesystem=xdg-run/tray-icon:create",
 
     "--talk-name=org.freedesktop.Notifications",
-
     "--talk-name=org.kde.StatusNotifierWatcher",
     "--talk-name=com.canonical.AppMenu.Registrar",
-<<<<<<< ours
-    "--own-name=org.kde.StatusNotifierItem*",
 
-=======
->>>>>>> theirs
     "--talk-name=org.mpris.MediaPlayer2.*"
   ],
   "add-extensions": {