Fix merge conflicts

1 files changed, 23 insertions, 23 deletions

diff --git a/src/js/utils/animation.js b/src/js/utils/animation.js
index 3f721b5a..d9e7615e 100644
--- a/src/js/utils/animation.js
+++ b/src/js/utils/animation.js
@@ -5,34 +5,34 @@
 import is from './is';
 
 export const transitionEndEvent = (() => {
-    const element = document.createElement('span');
+  const element = document.createElement('span');
 
-    const events = {
-        WebkitTransition: 'webkitTransitionEnd',
-        MozTransition: 'transitionend',
-        OTransition: 'oTransitionEnd otransitionend',
-        transition: 'transitionend',
-    };
+  const events = {
+    WebkitTransition: 'webkitTransitionEnd',
+    MozTransition: 'transitionend',
+    OTransition: 'oTransitionEnd otransitionend',
+    transition: 'transitionend',
+  };
 
-    const type = Object.keys(events).find(event => element.style[event] !== undefined);
+  const type = Object.keys(events).find(event => element.style[event] !== undefined);
 
-    return is.string(type) ? events[type] : false;
+  return is.string(type) ? events[type] : false;
 })();
 
 // Force repaint of element
 export function repaint(element, delay) {
-    setTimeout(() => {
-        try {
-            // eslint-disable-next-line no-param-reassign
-            element.hidden = true;
-
-            // eslint-disable-next-line no-unused-expressions
-            element.offsetHeight;
-
-            // eslint-disable-next-line no-param-reassign
-            element.hidden = false;
-        } catch (e) {
-            // Do nothing
-        }
-    }, delay);
+  setTimeout(() => {
+    try {
+      // eslint-disable-next-line no-param-reassign
+      element.hidden = true;
+
+      // eslint-disable-next-line no-unused-expressions
+      element.offsetHeight;
+
+      // eslint-disable-next-line no-param-reassign
+      element.hidden = false;
+    } catch (e) {
+      // Do nothing
+    }
+  }, delay);
 }