On Sat, Nov 15, 2003 at 08:00:38PM +1100, Daniel Stone wrote: > On Sat, Nov 15, 2003 at 03:12:20AM -0500, X Strike Force SVN Repository Admin wrote: [...] > > @@ -4897,3 +4904,6 @@ > > $Id$ > > > > vim:set ai et sts=2 sw=2 tw=78: > > +<<<<<<< .mine > > +======= > > +>>>>>>> .r769 > > You know, this is really starting to piss me off. Unlike the differences that aren't, that last bit is entirely your fault. :) -- G. Branden Robinson | It is the responsibility of Debian GNU/Linux | intellectuals to tell the truth and branden@debian.org | expose lies. http://people.debian.org/~branden/ | -- Noam Chomsky
Attachment:
signature.asc
Description: Digital signature