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 129 forks source link

Messed up merge #412

Closed brendonw1 closed 3 years ago

brendonw1 commented 3 years ago

Hey guys, I did a merge that I shouldn't have. Apologies. I think it's actually fine in terms of code, but I think I reversed it. I was using this GUI called GitKraken that does things in a way that feels opposite to me than it should. I was trying to merge one direction and merged the other direction.

Apologies