From 95104759ab620ea57747ff50e9a4eccadbabeb31 Mon Sep 17 00:00:00 2001
From: Iwan Timmer <irtimmer@gmail.com>
Date: Sun, 19 Apr 2020 11:37:02 +0200
Subject: [PATCH] Fix missed merging conflicts

Fixes commit 4711129
---
 src/input/evdev.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/input/evdev.c b/src/input/evdev.c
index f314d77e..88dfcb1f 100644
--- a/src/input/evdev.c
+++ b/src/input/evdev.c
@@ -57,11 +57,8 @@ struct input_device {
   struct libevdev *dev;
   bool is_keyboard;
   bool is_mouse;
-<<<<<<< HEAD
-  int rotate;
-=======
   bool is_touchscreen;
->>>>>>> tomblind/touchscreen
+  int rotate;
   struct mapping* map;
   int key_map[KEY_MAX];
   int abs_map[ABS_MAX];
@@ -606,13 +603,10 @@ void evdev_create(const char* device, struct mapping* mappings, bool verbose, in
   memset(&devices[dev].abs_map, -2, sizeof(devices[dev].abs_map));
   devices[dev].is_keyboard = is_keyboard;
   devices[dev].is_mouse = is_mouse;
-<<<<<<< HEAD
-  devices[dev].rotate = rotate;
-=======
   devices[dev].is_touchscreen = is_touchscreen;
+  devices[dev].rotate = rotate;
   devices[dev].touchDownX = TOUCH_UP;
   devices[dev].touchDownY = TOUCH_UP;
->>>>>>> tomblind/touchscreen
 
   int nbuttons = 0;
   for (int i = BTN_JOYSTICK; i < KEY_MAX; ++i) {