search

buzsakilab / buzcode

Code for internal lab sharing - polishing has started but is by no means complete
http://www.buzsakilab.com/
GNU General Public License v3.0
119 stars 126 forks source link

updates on the CFC functions #368

Closed eliezyer closed 4 years ago

eliezyer commented 4 years ago

Updates related to issue #292 . I haven't dealt with the name change for the functions and it is still missing a wrapper for all the functions.

eliezyer commented 4 years ago

I'm not allowed to resolve the conflicting files of this pull request

AntonioFR8 commented 4 years ago

This looks great. I can't see or fix the conflicts either. Its only in bz_PhaseAmplitudeDist

dlevenstein commented 4 years ago

Looks good! I can't see the conflicts on here either. I'll see what I can do when I get to lab.

dlevenstein commented 4 years ago

I think the problem is related to folder restructuring. Did you merge from dev into your fork before opening the pull request? Try merging from buzsakilab/dev to your fork, you should get some conflicts due to moved files, which you can resolve locally. And then we'll be able to merge the PR

eliezyer commented 4 years ago

I've dealt with the conflicts, it should be fine now

dlevenstein commented 4 years ago

Success!