annotate etc/spook.lines @ 108104:17710e3a17df

Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 2139854814c1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70822
2139854814c1 Update.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 70809
diff changeset
1 (binary:application/octet-stream)