Fix merge conflicts

1 files changed, 29 insertions, 29 deletions

diff --git a/src/js/utils/fetch.js b/src/js/utils/fetch.js
index ee33ea7c..ef695193 100644
--- a/src/js/utils/fetch.js
+++ b/src/js/utils/fetch.js
@@ -4,39 +4,39 @@
 // ==========================================================================
 
 export default function fetch(url, responseType = 'text') {
-    return new Promise((resolve, reject) => {
-        try {
-            const request = new XMLHttpRequest();
+  return new Promise((resolve, reject) => {
+    try {
+      const request = new XMLHttpRequest();
 
-            // Check for CORS support
-            if (!('withCredentials' in request)) {
-                return;
-            }
+      // Check for CORS support
+      if (!('withCredentials' in request)) {
+        return;
+      }
 
-            request.addEventListener('load', () => {
-                if (responseType === 'text') {
-                    try {
-                        resolve(JSON.parse(request.responseText));
-                    } catch (e) {
-                        resolve(request.responseText);
-                    }
-                } else {
-                    resolve(request.response);
-                }
-            });
+      request.addEventListener('load', () => {
+        if (responseType === 'text') {
+          try {
+            resolve(JSON.parse(request.responseText));
+          } catch (e) {
+            resolve(request.responseText);
+          }
+        } else {
+          resolve(request.response);
+        }
+      });
 
-            request.addEventListener('error', () => {
-                throw new Error(request.status);
-            });
+      request.addEventListener('error', () => {
+        throw new Error(request.status);
+      });
 
-            request.open('GET', url, true);
+      request.open('GET', url, true);
 
-            // Set the required response type
-            request.responseType = responseType;
+      // Set the required response type
+      request.responseType = responseType;
 
-            request.send();
-        } catch (e) {
-            reject(e);
-        }
-    });
+      request.send();
+    } catch (e) {
+      reject(e);
+    }
+  });
 }