diff src/xterm.h @ 108104:17710e3a17df

Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 1d1d5d9bd884
children b5f73bf59a4f 60266cf487b0
line wrap: on
line diff