tree 90e1cec177166c343a54c7d51a789e9739e55373
parent 60c1e89989c02563a8ec2d154897c9f2888e6893
author Kevin Pike <kpike@doubledutch.me> 1430870967 -0700
committer Kevin Pike <kpike@doubledutch.me> 1430870967 -0700

remove duplicate test from bad merge