diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug index 42a5db89cc8fff3687935e3de55795e94b50d90b..324fd8abe4f719a28dfbbe3b8aded862f9d713f5 100644 --- a/src/includes/mentor/dashboard.pug +++ b/src/includes/mentor/dashboard.pug @@ -38,17 +38,11 @@ section#home hidden i.fas.fa-spinner.fa-spin -<<<<<<< HEAD - include resources/detail.pug - - h2.title_lead_avenir=`${data.RelatedResources}` -======= include resources/comment.pug include resources/detail.pug h2.title_form.related=`${data.RelatedResources}` ->>>>>>> 44ede0e17b643c8bf5eb11f00516bfea3ae53618 sib-display( bind-resources