xorg: fix bad merge conflict

This commit is contained in:
Jonathan Ringer 2021-06-15 19:43:00 -07:00
parent d1d37feb6d
commit 413994ab1c
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0

File diff suppressed because it is too large Load diff