bernd 9b0c253c15 Add @conflict markers for the following conflicts:
devtodo-0.1.17p1,openmotif-demos-2.3.0
        /usr/local/bin/todo
gnokii-0.6.14p2,gnokii-0.6.14p2-no_x11,smstools-3.0.9
        /usr/local/bin/sendsms
openmotif-demos-2.3.0,tree-0.61
        /usr/local/bin/tree

ok espie@
2007-08-03 17:42:45 +00:00
..
2007-04-05 17:26:05 +00:00
2007-04-05 17:26:05 +00:00
2007-04-05 17:26:05 +00:00
2007-04-05 17:26:05 +00:00
2007-07-13 08:53:47 +00:00
2007-04-05 17:26:05 +00:00
2007-04-05 17:26:05 +00:00
2007-07-07 17:59:05 +00:00
2007-07-16 14:24:57 +00:00
2007-04-05 17:26:05 +00:00
2007-05-20 14:32:45 +00:00
2007-07-16 14:25:43 +00:00