This is in trunk know

http://code.google.com/p/web2py/source/browse/trunk/VERSION

something got corrupted in the checkout I guess.

Massimo

On Dec 10, 11:13 am, "Wes James" <[EMAIL PROTECTED]> wrote:
> I did an svn checkout of web2py.
>
> What does this mean:
>
> cat VERSION
> <<<<<<< .mine
> Version 1.52 (2008-12-03 11:25:27)
> =======
> Version 1.53.5 (2008-12-08 16:55:03)
>
> >>>>>>> .r543
>
> Why are there two version items in the VERSION file?
>
> -wj
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"web2py Web Framework" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/web2py?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to