[horde] Share.php

[Andy]

Hmmmppffff.

Sure I beleive you. The file you mention really looks very different. But am
wondering why I got this file. Did a "cvs update -pD" in my horde/ directory
and got this file:

-rw-r--r--    1 root     root        22597 Jun  5 16:49
/usr/local/apache/htdocs/horde/lib/Share.php

Is this the wrong way to update?

Andy



Quoting Chuck Hagenbuch <chuck at horde.org>:

> Quoting Andy <andy at stronzo.d2g.com>:
>
> > Yes. This is it:
>
> > LINE 279: <<<<<<< Share.php
>
> > Didn't change anything.
>
> .. and you didn't pay attention to your checkout, either. That's *not* the
> latest version of the file. In fact, it isn't really any version of the
> file; it's an old version with a confict that CVS couldn't resolve munged
> into it.
>
> If you don't believe me, just look:
> http://cvs.horde.org/co.php/horde/lib/Share.php
>
> -chuck
>
> --
> Charles Hagenbuch, <chuck at horde.org>
> The alligators were there, too, in a bathtub inside the house.
>
>
> --
> Horde mailing list
> Frequently Asked Questions: http://horde.org/faq/
> To unsubscribe, mail: horde-unsubscribe at lists.horde.org
>




-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/