Closed adamkewley closed 4 years ago
Hi,
This PR removes a merge conflict that was committed into master at some point. It wasn't caught by the compiler because it is in cmaes.c's file header. It was spotted while merging the latest master into simbody here:
master
cmaes.c
https://github.com/simbody/simbody/pull/690
This is just a cosmetic, rather than functional, change.
Hi,
This PR removes a merge conflict that was committed into
masterat some point. It wasn't caught by the compiler because it is incmaes.c's file header. It was spotted while merging the latestmasterinto simbody here:https://github.com/simbody/simbody/pull/690
This is just a cosmetic, rather than functional, change.