Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit c5175e1

Browse files
committed
🔥 Weird, must have been a merge issue
1 parent 0314571 commit c5175e1

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

‎src/browser/components/preferences/main-js.patch‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
2-
index a4a4ec894115afc70d203661f2b225adeeeaa8fc..6e39c59690e115ea484f55a70eb964b114c087fc 100644
2+
index 1ce4ba85a0df22b4176443c9003669577b6a230c..a582693e2b7e6fd1e150d25f51c9f578065ce14c 100644
33
--- a/browser/components/preferences/main.js
44
+++ b/browser/components/preferences/main.js
5-
@@ -161,6 +161,13 @@ Preferences.addAll([
5+
@@ -161,6 +161,12 @@ Preferences.addAll([
66

77
// Media
88
{ id: "media.hardwaremediakeys.enabled", type: "bool" },
99
+
1010
+
1111
+ // Pulse browser: custom settings
1212
+ { id: 'pulse.sidebar.enabled', type: 'bool' },
13-
+ { id: 'pulse.sidebar.extensions.enabled', type: 'bool' },
1413
+ { id: 'pulse.sidebar.keeptabsactive.enabled', type: 'bool' },
1514
+ { id: 'pulse.tabs.vertical', type: 'bool' }
1615
]);

0 commit comments

Comments
 (0)