[SciPy-Dev] Scipy docstrings

[Cera, Tim]

A whole bunch of conflicts and merges showed up on the docstring editor at
http://docs.scipy.org/scipy/merge/

Can't 'Accept Merges' because all of the merges that I looked at did not
follow the docstring standard.  There isn't a way to 'Reject Merges', so
what I have done in the past is accept, then revert.  Could this be handled
in some other way?

Kindest regards,
Tim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.scipy.org/pipermail/scipy-dev/attachments/20120920/c336aa51/attachment.html