On Jan 13, 2008 12:39 PM, trebor <[EMAIL PROTECTED]> wrote: > > Guys, > > Lot's of "<<<<<< .mine"'s left in break between these two. > > I just happened to have update two machines one to 7014 and the other > to 7015, in the space of an hour. > > error pops up in __init__.py in the <site-packages>/django directory > > There are others scattered through out.
Sounds like you have some sort of repository corruption on your end. The problem doesn't appear to be on the Django repository. [7014] was a pure documentation change; [7015] only modified the m2m recursive test. I've updated trunk on my local checkout (to [7017]), and I can't find any SVN detritus that has been checked in. You need to do a clean checkout, or an SVN revert to get the clean copy. If you're still having a problem, point us at a specific file, and we can check the repository. Yours, Russ Magee %-) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django developers" 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/django-developers?hl=en -~----------~----~----~----~------~----~------~--~---
