Fix merge conflicts
authorStephen Frost <sfrost@snowman.net>
Mon, 9 Sep 2019 00:20:15 +0000 (20:20 -0400)
committerStephen Frost <sfrost@snowman.net>
Mon, 9 Sep 2019 00:20:15 +0000 (20:20 -0400)
commit64ab3218fcce1e1333ec89bfd149523444c52c16
tree5b85185e7073fbaafecf9f5c32195e5fb939d8dc
parent8a93e7a0d6cdf12d72bc408e334cd4b8249fa85c
parent61a34436bf7b426e694dd8fa5d6df0f48172f9e1
Fix merge conflicts
template/base.html
template/base_pgdu.html