From c7d0860edaf105b2c3fbe4f6061bab110293d71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= <benedikt@contentful.com>
Date: Wed, 4 Oct 2017 11:24:55 +0200
Subject: [PATCH] remove merge conflict from lesson module image

---
 views/mixins/_lessonModuleImage.pug | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/views/mixins/_lessonModuleImage.pug b/views/mixins/_lessonModuleImage.pug
index db3c413..3ec3370 100644
--- a/views/mixins/_lessonModuleImage.pug
+++ b/views/mixins/_lessonModuleImage.pug
@@ -1,11 +1,6 @@
 mixin lessonModuleImage(module)
   .lesson-module.lesson-module-image
-<<<<<<< Updated upstream
     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
       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