Skip to content
Snippets Groups Projects
Commit 8b8d5b6f authored by Alice Poggioli's avatar Alice Poggioli
Browse files

resolve minor conflict.

parents b7767673 64e247e8
No related branches found
Tags v0.0.20
1 merge request!92Feature/breaking changes 0.9
......@@ -15,7 +15,11 @@ sib-widget(name='cs-steps-resources-multiple')
div.resource_resume_header
p ${await value.name}
p ${await value.publication_year}
<<<<<<< HEAD
p ${await value.description}
=======
p $await {value.description}
>>>>>>> 64e247e82a61e60fd470548139cfa3afbd69c5ff
sib-widget(name='cs-steps-header')
template
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment