Merge remote-tracking branch 'vanilla/next' into gaps-next

tdemin · Jan 2, 2021 · 1686326 · 1686326
2 parents 28dd055 + 8d0b8b5
commit 1686326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/RELEASE-NOTES-next b/RELEASE-NOTES-next
@@ -21,3 +21,4 @@ strongly encouraged to upgrade.
 
   • when initializing new outputs, avoid duplicating workspace numbers
   • fix workspaces not moving to assigned output after output becomes available
+  • fix duplicate bindcode after i3-config-wizard
diff --git a/etc/config.keycodes b/etc/config.keycodes
@@ -51,7 +51,7 @@ bindcode $mod+40 exec --no-startup-id dmenu_run
 # bindcode $mod+40 exec rofi -modi drun,run -show drun
 # There also is i3-dmenu-desktop which only displays applications shipping a
 # .desktop file. It is a wrapper around dmenu, so you need that installed.
-bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
+# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
 
 # change focus
 bindcode $mod+44 focus left