More merge resolution.

This commit is contained in:
Ezra 2015-08-19 11:29:32 -05:00
parent 0b23962564
commit 745031e6f9

View file

@ -26,7 +26,7 @@ static bool resizing = false;
static bool lock_left, lock_right, lock_top, lock_bottom = false; static bool lock_left, lock_right, lock_top, lock_bottom = false;
static bool floating_mod_pressed(void) { 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) { static bool pointer_test(swayc_t *view, void *_origin) {