From 9cffcd6ccd94ec1a2aa16b131a265ca58203586d Mon Sep 17 00:00:00 2001 From: vanfanel Date: Mon, 12 Feb 2024 12:17:41 +0100 Subject: [PATCH] Resolve remaining rebase conflict. --- seat.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/seat.c b/seat.c index f5ada005..2350810a 100644 --- a/seat.c +++ b/seat.c @@ -851,13 +851,8 @@ handle_cursor_motion_relative(struct wl_listener *listener, void *data) double dx = event->delta_x; double dy = event->delta_y; -<<<<<<< HEAD process_cursor_motion(seat, event->time_msec, &dx, &dy, event->unaccel_dx, event->unaccel_dy); -======= - process_cursor_motion(seat, event->time_msec, &dx, &dy, event->unaccel_dx, event->unaccel_dy); - ->>>>>>> c490ac1 (Use clang-format to ensure correct format of the changed files.) wlr_cursor_move(seat->cursor, &event->pointer->base, dx, dy); wlr_idle_notifier_v1_notify_activity(seat->server->idle, seat->seat); }