Unsolved conflict during #75 pull request causes read_tomo error

[decarlof]

#75 is causing:

proj, flat, dark, theta, params_rotation_axis_ignored = file_io.read_tomo(sino, pproj, params, True) TypeError: read_tomo() takes from 2 to 3 positional arguments but 4 were given

I think this is because of the unsolved conflict at:

is possible that the last changes were made on a local version that was not current.

It should be simple to solve by just replacing:

read_tomo(sino, params, ignore_flip = False):

with the new:

read_tomo(sino, proj, params, ignore_flip = False):