From 6ccc01e9ef271238c626c578e291de23b6392f29 Mon Sep 17 00:00:00 2001
From: Samuel Grahn <samuel.grahn@outlook.com>
Date: Thu, 24 Jan 2019 00:50:10 +0100
Subject: [PATCH] Fix the failed rebase.

---
 include/sway/input/cursor.h |  4 ----
 sway/input/cursor.c         | 22 ++--------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index ad2a25076..1e06c4c31 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -36,10 +36,6 @@ struct sway_cursor {
 	struct wl_listener axis;
 	struct wl_listener frame;
 
-<<<<<<< HEAD
-
-=======
->>>>>>> Register touch events in libtouch engine
 	struct libtouch_engine *gesture_engine;
 	struct wl_listener touch_down;
 	struct wl_listener touch_up;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 5bc67de08..a1beeeb7c 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -361,17 +361,10 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
 				event->touch_id, sx, sy);
 		cursor_set_image(cursor, NULL, NULL);
 	}
-
-<<<<<<< HEAD
-	libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
-				       LIBTOUCH_TOUCH_DOWN, event->x, event->y);
-
-		
-=======
 	libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
 				       event->touch_id, LIBTOUCH_TOUCH_DOWN,
 				       event->x, event->y);
->>>>>>> Register touch events in libtouch engine
+
 }
 
 static void handle_touch_up(struct wl_listener *listener, void *data) {
@@ -382,14 +375,8 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 	struct wlr_seat *seat = cursor->seat->wlr_seat;
 	// TODO: fall back to cursor simulation if client has not bound to touch
 	wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id);
-<<<<<<< HEAD
-	libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
-				       LIBTOUCH_TOUCH_UP, 0,0);
-=======
-
 	libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
 				       event->touch_id, LIBTOUCH_TOUCH_UP, 0, 0);
->>>>>>> Register touch events in libtouch engine
 }
 
 static void handle_touch_motion(struct wl_listener *listener, void *data) {
@@ -429,14 +416,9 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
 		wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
 			event->touch_id, sx, sy);
 	}
-
-<<<<<<< HEAD
-	libtouch_engine_register_move(engine, event->time_msec, event->touch_id,
-			       event->x, event->y);
-=======
 	libtouch_engine_register_move(cursor->gesture_engine, event->time_msec,
 				      event->touch_id, event->x, event->y);
->>>>>>> Register touch events in libtouch engine
+
 }
 
 static double apply_mapping_from_coord(double low, double high, double value) {