Resolve merge conflict with main

gjsify · Sep 20, 2024 · 3736744 · 3736744
2 parents 1d78a6f + 7b03706
commit 3736744
Show file tree

Hide file tree

Showing 2 changed files with 630 additions and 626 deletions.
diff --git a/packages/gnome-shell/src/ui/popupMenu.d.ts b/packages/gnome-shell/src/ui/popupMenu.d.ts
@@ -217,6 +217,7 @@ export class PopupMenuBase<S extends Signals.SignalMap<S> = PopupMenuBase.Signal
     readonly firstMenuItem: PopupBaseMenuItem | PopupMenuSection;
     readonly numMenuItems: number;
 
+    _getMenuItems(): (PopupBaseMenuItem | PopupMenuSection)[];
     getSensitive(): boolean;
     setSensitive(sensitive: boolean): void;
     addAction(title: string, callback: () => void, icon?: Gio.Icon): void;