Resolve remaining rebase conflict.

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);
 }