diff options
Diffstat (limited to 'layouts/partials/footer.html')
| -rw-r--r-- | layouts/partials/footer.html | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c95abb9..c35d857 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,3 +1,10 @@ +<<<<<<< HEAD +<footer id="footer" class="mobile-only"> + <p class="small"> + {{ .Site.Copyright }} + </p> +</footer> +======= <footer id="footer" class="mobile-only">
<p class="small">
{{ if or (.Site.Params.copyright) (.Site.Params.credit) }}
@@ -12,3 +19,4 @@ {{ end }}
</p>
</footer>
+>>>>>>> bc3b59fd459be92483fe0d7e20a8169a3ec1543d |