From 981c0dab75037140b1103cce16c6949929098f7e Mon Sep 17 00:00:00 2001 From: Stephen Frost Date: Sun, 8 Sep 2019 20:20:49 -0400 Subject: [PATCH] Fix merge conflict --- template/base.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/base.html b/template/base.html index 765fe69..51b5ea4 100644 --- a/template/base.html +++ b/template/base.html @@ -61,11 +61,7 @@ -- 2.39.5