[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: X Strike Force XFree86 SVN commit: rev 770 - in branches/4.3.0/sid/debian: . patches



On Mon, Nov 17, 2003 at 03:45:49AM -0500, Branden Robinson wrote:
> 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.  :)

Well, yeah, I forgot to cut this stanza. But my point still stands.

-- 
Daniel Stone                                                <daniels@debian.org>
Debian X Strike Force:                    http://people.debian.org/~branden/xsf/

Attachment: pgp30LRzDYyw3.pgp
Description: PGP signature


Reply to: