fix merge conflict

fredcw · fredcw · commit 40274f389624 · 2025-11-21T06:34:34.000Z
diff --git a/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
@@ -60,7 +60,6 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
     on_applet_removed_from_panel () {
         Main.keybindingManager.removeXletHotKey(this, "notification-open");
         Main.keybindingManager.removeXletHotKey(this, "notification-clear");
-        global.settings.disconnect(this.panelEditModeHandler);
 
         this.destroy();
     }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {`
`60`	`60`	`on_applet_removed_from_panel () {`
`61`	`61`	`Main.keybindingManager.removeXletHotKey(this, "notification-open");`
`62`	`62`	`Main.keybindingManager.removeXletHotKey(this, "notification-clear");`
`63`		`- global.settings.disconnect(this.panelEditModeHandler);`
`64`	`63`
`65`	`64`	`this.destroy();`
`66`	`65`	`}`