From 745031e6f97b871de0c37572b085aea4eae855a8 Mon Sep 17 00:00:00 2001 From: Ezra Date: Wed, 19 Aug 2015 11:29:32 -0500 Subject: More merge resolution. --- sway/handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/handlers.c b/sway/handlers.c index 92d9b6af..00f10a0c 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -26,7 +26,7 @@ static bool resizing = false; static bool lock_left, lock_right, lock_top, lock_bottom = false; static bool floating_mod_pressed(void) { - return key_modifiers & config->floating_mod; + return key_modifiers & config->floating_mod; } static bool pointer_test(swayc_t *view, void *_origin) { -- cgit v1.2.3-70-g09d2