fix merge conflicts
authorSarah Conway <sarah.conway@crunchydata.com>
Fri, 27 Jul 2018 19:14:09 +0000 (12:14 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Fri, 27 Jul 2018 19:14:09 +0000 (12:14 -0700)
commit7f46c506d724189b97ace7ab42129f5737cc3679
tree8489eb350d3fac7b013f833be6a15aad91754473
parent22fb991591cb86dd86a782c0211987d9249ea4df
parent51660ed54aa4c4609ca3405138c81c616ab51bf5
fix merge conflicts
templates/context.json