cleanup after merge

This commit is contained in:
David Personette 2017-08-29 08:46:12 -04:00
parent 240a1ed48e
commit 1f922b46bc