lbonn 9f458ad2e7 Fix a merge conflict resolution error

2025-05-18 20:20:19 +02:00

..

display.c

Merge tag '1.7.9' into wayland

2025-05-18 20:03:28 +02:00

view.c

Fix a merge conflict resolution error

2025-05-18 20:20:19 +02:00