It seems I am the biggest offender. :( Sorry, upgraded my text editor recently and forgot to set default line-ending style.
Cheers, Simon Kevin Dangoor wrote: > I got a couple conflicts trying to merge from 1.0 to trunk and it > looks like test_errorhandling at least has some bad line endings that > my editor graciously corrected, but now I need to merge. (And it's > harder for me to know if I just take everything since work has begun > on the trunk). > > So, just a reminder to keep your editors set for spaces and unix-style > line endings. > > thanks, > Kevin > > -- > Kevin Dangoor > TurboGears / Zesty News > > email: [EMAIL PROTECTED] > company: http://www.BlazingThings.com > blog: http://www.BlueSkyOnMars.com > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "TurboGears Trunk" 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/turbogears-trunk -~----------~----~----~----~------~----~------~--~---
