Remains of a merge conflict causing matlab errors:

DevelopmentalImagingMCRI / freesurfer_statsurf_display

Displays regional stats on Freesurfer surfaces in MATLAB

GNU General Public License v3.0

15 stars 1 forks source link

Closed richardbeare closed 4 years ago

richardbeare commented 5 years ago

There are merge conflict markers here

Could be others - haven't checked.

richardbeare commented 5 years ago

@chrisadamsonmcri - there's been a merge problem somewhere...

chrisadamsonmcri commented 4 years ago

No problems now. Thanks richard.