[Libevent-users] conflict checked into subversion (tags/release-1.3b/libevent/configure.in)

[Elliot Foster]

I thought that might have been the case, but before I had sent the email, I cleaned it out and updated again.  Going straight to the repo shows it best:

http://levent.svn.sf.net/svnroot/levent/tags/release-1.3b/libevent/configure.in

It's not a huge deal, but I thought you might want to know.  At which repository are you looking?  In case it's not clear, it's not in trunk, it's in tags/release-1.3b (from when you tagged it from 1.3a, it looks like.)

Elliot

Niels Provos wrote:
> I think that this is a conflict in your local checkout.    The
> configure.in in the repository seems fine.
> 
> Niels.
> 
> On 7/20/07, Elliot F <elliotf-libevent at gratuitous.net> wrote:
>> It appears that a subversion conflict got checked into subversion.  Line
>> 4 of configure.in has the conflict listed, which b0rks the configure
>> script when run.  Just an FYI.
>>
>> Thanks,
>>
>> Elliot
>> _______________________________________________
>> Libevent-users mailing list
>> Libevent-users at monkey.org
>> http://monkey.org/mailman/listinfo/libevent-users
>>
>>