fix community

Signed-off-by: Mary Anthony <mary@blockstack.com>
6 years ago · c32de95d7e
1 changed files with 0 additions and 4 deletions
--- a/_layouts/community.html
+++ b/_layouts/community.html
@ -8,11 +8,7 @@ layout: default

            <div class="sidebar-fixed-width uk-visible@m">
                <div class="sidebar-docs uk-position-fixed">
-<<<<<<< HEAD
-             <h1 class="uk-article-title">&nbsp;</h1>
-=======
             <h1 class="uk-article-title">Back</h1>
->>>>>>> Updating with community file
                  {{ content | toc_only }}
                </div>
            </div>