fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/app/scripts/lib/cleanErrorStack.js b/app/scripts/lib/cleanErrorStack.js
index fe1bfb0ce..8adf55db7 100644
--- a/app/scripts/lib/cleanErrorStack.js
+++ b/app/scripts/lib/cleanErrorStack.js
@@ -3,7 +3,7 @@
  * @param {Error} err - error
  * @returns {Error} Error with clean stack trace.
  */
-function cleanErrorStack(err){
+function cleanErrorStack (err) {
   var name = err.name
   name = (name === undefined) ? 'Error' : String(name)