From b893805496f377c6e5ad0dc8d5153badaa7869cb Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Thu, 16 Feb 2023 11:43:04 +0100
Subject: [PATCH] fix conflict
---
layouts/diplomas/term.html | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/layouts/diplomas/term.html b/layouts/diplomas/term.html
index 6751e223..807600e0 100644
--- a/layouts/diplomas/term.html
+++ b/layouts/diplomas/term.html
@@ -12,10 +12,9 @@
<a href="{{ .Permalink }}" class="title" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
{{- $title -}}
</a>
- {{ if .Params.presentation }}
+ {{ if .Params.summary }}
<p class="description">
- {{/* TODO: replace with description_short */}}
- {{- partial "PrepareHTML" .Params.presentation -}}
+ {{- partial "PrepareHTML" .Params.summary -}}
</p>
{{ end }}
</li>
--
GitLab