More merge resolution.

9 years ago · 745031e6f9
parent 0b23962564
commit 745031e6f9
1 changed files with 1 additions and 1 deletions
--- 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) {