resolving conflicts
authorCraig Kerstiens <craig.kerstiens@gmail.com>
Fri, 8 Jun 2018 15:50:17 +0000 (08:50 -0700)
committerCraig Kerstiens <craig.kerstiens@gmail.com>
Fri, 8 Jun 2018 15:50:17 +0000 (08:50 -0700)
commita2f22ce674221ddfcda3d51d90fcc0c4a7c8f76b
tree673e603591dd05ff33f18b2d60a8ea7725e48f48
parent189fb4590245f9c564c6be1626e63fb847b31ce1
parent56e416444674ee8bf5cb2b8a5c564e84c62824e4
resolving conflicts
templates/base.html
templates/context.json