Kristján Valur Jónsson <krist...@ccpgames.com> added the comment:

Well, I think I have all of the merge errors out now.  You´ll forgive me if I 
didn't notice them all at first, but this is why we review code and you would 
have helped me by giving me specifics, since after a time, the eyes tend to 
glaze over.
Any other comments?

----------
Added file: http://bugs.python.org/file25149/duplicate.patch

_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue14310>
_______________________________________
_______________________________________________
Python-bugs-list mailing list
Unsubscribe: 
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com

Reply via email to