search

fooof-tools / DevelopmentalDemo

Tutorial for developmental data with spectral parameterization.
MIT License
7 stars 2 forks source link

Developments #9

Closed ghost closed 3 years ago

ghost commented 3 years ago

@TomDonoghue Do you know why this conflict is popping up? I fixed a few minor typos in the section of the script you recently edited. It's not letting me merge though.

TomDonoghue commented 3 years ago

I fixed the merge conflicts (something with branches got in a bit of a tangle, leading to small conflicts in changes here and in main, such that it couldn't automatically merge). @bostlund - if you want to take a quick check that everything here looks good (the changes are as intended), you can then merge this in!