sway

commit 745031e6f97b871de0c37572b085aea4eae855a8
parent 0b23962564a52dff8dd70488f33bc08eeb5aef03
Author: Ezra <luminarys@fuwa.se>
Date:   Wed, 19 Aug 2015 11:29:32 -0500

More merge resolution.
Diffstat:
M
sway/handlers.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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) {