Fix merge conflicts

1 files changed, 8 insertions, 8 deletions

diff --git a/src/js/utils/arrays.js b/src/js/utils/arrays.js
index 69ef242c..aed951cd 100644
--- a/src/js/utils/arrays.js
+++ b/src/js/utils/arrays.js
@@ -6,18 +6,18 @@ import is from './is';
 
 // Remove duplicates in an array
 export function dedupe(array) {
-    if (!is.array(array)) {
-        return array;
-    }
+  if (!is.array(array)) {
+    return array;
+  }
 
-    return array.filter((item, index) => array.indexOf(item) === index);
+  return array.filter((item, index) => array.indexOf(item) === index);
 }
 
 // Get the closest value in an array
 export function closest(array, value) {
-    if (!is.array(array) || !array.length) {
-        return null;
-    }
+  if (!is.array(array) || !array.length) {
+    return null;
+  }
 
-    return array.reduce((prev, curr) => (Math.abs(curr - value) < Math.abs(prev - value) ? curr : prev));
+  return array.reduce((prev, curr) => (Math.abs(curr - value) < Math.abs(prev - value) ? curr : prev));
 }