diff options
-rw-r--r-- | layouts/partials/footer.html | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 5b2c7f7..0ce23a7 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -17,17 +17,12 @@ {{ if or .Site.Params.mobile .Site.Params.email }} <h6>Contact Info</h6> <ul class="list-unstyled"> -<<<<<<< HEAD {{ if .Site.Params.mobile }} - <li class="font-secondary text-dark">Tel : {{ .Site.Params.mobile | markdownify }}</li> + <li class="font-secondary text-dark">Tel : {{ .site.Params.mobile | markdownify }}</li> {{ end }} {{ if .Site.Params.email }} - <li class="font-secondary text-dark">Email : {{ .Site.Params.email | markdownify }}</li> + <li class="font-secondary text-dark">Email : {{ .site.Params.email | markdownify }}</li> {{ end }} -======= - <li class="font-secondary text-dark">Tel : {{ site.Params.mobile | markdownify }}</li> - <li class="font-secondary text-dark">Email : {{ site.Params.email | markdownify }}</li> ->>>>>>> df24e83ce3d2ac97f64500bb77538447815d9cc7 </ul> {{ end }} </div> |