mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the failed rebase.

Browse source
This commit is contained in:
Samuel Grahn 2019-01-24 00:50:10 +01:00
parent ba2020aebd
commit 6ccc01e9ef
2 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/sway/input/cursor.h
View file

@ -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;