Fix botched merge in CHANGELOG
authorJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:11:02 +0000 (14:11 -0800)
committerJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:11:02 +0000 (14:11 -0800)
commit76696e80041dc5b8f4ba986f4f83d6e7b6854e96
tree613ccca3d1cfad1d36886867cdf8dfd7ed235347
parentf4d500f98e0e298a98099ec2177b43571e9cda61
Fix botched merge in CHANGELOG
CHANGELOG