Attempt to fix "conflict dependencies" error#43

Open

JackLonergan97 wants to merge 2 commits intosimonsobs:mainfrom

JackLonergan97:master

Commits on Jul 5, 2021

Updated cross.py in master branch to match cross.py from act_sz_x_cib branch
jacklone
committed
adding data file from act_sz_x_cib branch not present in master branch
jacklone
committed