st/xorg: fix merge droppings

These were stranded in emacs and not saved before committing.
2 files changed