Fix merge conflicts

1 files changed, 9 insertions, 9 deletions

diff --git a/src/js/utils/load-image.js b/src/js/utils/load-image.js
index 8acd2496..36d6ab81 100644
--- a/src/js/utils/load-image.js
+++ b/src/js/utils/load-image.js
@@ -5,15 +5,15 @@
 // ==========================================================================
 
 export default function loadImage(src, minWidth = 1) {
-    return new Promise((resolve, reject) => {
-        const image = new Image();
+  return new Promise((resolve, reject) => {
+    const image = new Image();
 
-        const handler = () => {
-            delete image.onload;
-            delete image.onerror;
-            (image.naturalWidth >= minWidth ? resolve : reject)(image);
-        };
+    const handler = () => {
+      delete image.onload;
+      delete image.onerror;
+      (image.naturalWidth >= minWidth ? resolve : reject)(image);
+    };
 
-        Object.assign(image, { onload: handler, onerror: handler, src });
-    });
+    Object.assign(image, { onload: handler, onerror: handler, src });
+  });
 }