hyperspy/hyperspy — Issue #32: git pull issue
Author: mwalls
Created: 2011-11-07 14:31:53+00:00
State: open

I tried git pull this morning and got an error which I will send by conventional e-mail (can't paste it here). Basically it aborted because "files would be overwritten by merge".