Fix merge conflict
authorStephen Frost <sfrost@snowman.net>
Mon, 9 Sep 2019 00:20:49 +0000 (20:20 -0400)
committerStephen Frost <sfrost@snowman.net>
Mon, 9 Sep 2019 00:20:49 +0000 (20:20 -0400)
commit981c0dab75037140b1103cce16c6949929098f7e
tree8385bc8d7e2ab09a3526c159f4aca6981976bbe7
parent64ab3218fcce1e1333ec89bfd149523444c52c16
Fix merge conflict
template/base.html