[Adduser-devel] argh

[Stephen Gran]

This one time, at band camp, Marc Haber said:
> On Wed, Apr 26, 2006 at 06:16:27PM +0100, Stephen Gran wrote:
> > This one time, at band camp, Marc Haber said:
> > > On Wed, Apr 26, 2006 at 04:51:02PM +0100, Stephen Gran wrote:
> > > > 
> > > > Did you mean to leave the <<<<<<'s in?
> > > 
> > > No, and there aren't any in my local copy? Which file are you refering
> > > to?
> > 210:<<<<<<< .mine
> > 214:>>>>>>> .r562
> 
> Looks like conflicts of your local working copy with the repository.
> try svn revert adduser.

Duh! That was staring me in the face.  Well, thanks, fixed now.
/me goes back to reading svn docs ...
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran at debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20060426/d9da56c0/attachment-0001.pgp