On Tue, May 29, 2012 at 11:29 AM, Terry Brown <[email protected]> wrote:

> so nested_splitter.py wasn't changed by anything you did

That's what I expected.  I "resolved" the conflict by taking your version.

Next, I'll remove the pylint warnings, and all should be right.

EKR

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" 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/leo-editor?hl=en.

Reply via email to