Resolve merge conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/app/scripts/lib/createOriginMiddleware.js b/app/scripts/lib/createOriginMiddleware.js
index e1e097cc4..f8bdb2dc2 100644
--- a/app/scripts/lib/createOriginMiddleware.js
+++ b/app/scripts/lib/createOriginMiddleware.js
@@ -1,9 +1,9 @@
 // append dapp origin domain to request
 module.exports = createOriginMiddleware
 
-function createOriginMiddleware({ origin }) {
+function createOriginMiddleware ({ origin }) {
   return function originMiddleware (req, res, next, end) {
     req.origin = origin
     next()
   }
-}
\ No newline at end of file
+}