Agile611/the-example-app-nodejs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove merge conflict from lesson module image

Browse Source
This commit is contained in:
Benedikt Rötsch
2017-10-04 11:24:55 +02:00
committed by Benedikt Rötsch
parent 0c2c060acb
commit c7d0860eda
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
views/mixins/_lessonModuleImage.pug
View File

@@ -1,11 +1,6 @@
mixin lessonModuleImage(module) mixin lessonModuleImage(module)
.lesson-module.lesson-module-image .lesson-module.lesson-module-image
<<<<<<< Updated upstream
if module.fields.file && module.fields.file.url if module.fields.file && module.fields.file.url
img.lesson-module-image__image(src=module.fields.file.url alt=module.fields.title) img.lesson-module-image__image(src=module.fields.image.fields.file.url alt=module.fields.image.fields.title)
else else
h3 ⚠️ Image missing h3 ⚠️ Image missing
=======
img.lesson-module-image__image(src=module.fields.image.fields.file.url alt=module.fields.image.fields.title)
div.lesson-module-image__title #{module.fields.title}
>>>>>>> Stashed changes