Closed amuller26 closed 2 weeks ago
Some functions and variables I didn't alphabetize because I wasn't sure if there was a specific reason why they are grouped how they are, like everything in the Sugarsape __init__
.
Resolved merge conflicts. @amuller26, please double check I did not accidentally overwrite any of your changes by comparing this to your local version.
I finished modifying all files, and I am pretty sure all of the conflicts are now resolved and merged.
Just kidding. Now the merge conflicts should be resolved. I accidentally introduced a bug into the master branch which broke this PR for a bit. All fixed. Ready for review.
Fixed.
Alphabetizes everything that can be listed in alphabetical order.