search

jmfrancklab / proc_scripts

Other
0 stars 1 forks source link

Nutation proc #102

Open jmfranck opened 3 months ago

jmfranck commented 3 months ago

in order to resolve the conflicts, merge master into this branch on your computer, and resolve the conflicts

jmfranck commented 3 months ago

be sure to read the comments tab for this PR! I implemented several of the formatting-style changes, so that my earlier comments don't show up in the diff

jmfranck commented 3 months ago

You need to merge in master and resolve conflicts. I highly recommend running black on the conflicting files before merging (b/c many of the issues might come from the fact that I ran black on master)