Yet another conflict marker
authorRyan Rix <ry@n.rix.si>
Sat, 30 Jan 2010 06:29:01 +0000 (22:29 -0800)
committerRyan Rix <ry@n.rix.si>
Sat, 30 Jan 2010 06:29:01 +0000 (22:29 -0800)
commita1ed90233e1884977a68a9d38ce6f0e52e727863
tree72d7ea5fe3609c1ad5275e5d9ad407e141e3739a
parent15a349249a5293b97bc826b992d2af6e6dcc6ff6
Yet another conflict marker
src/viewer/ignore.h