From da16f396266daa5ab0acc8f0c04d3e25b98c39f0 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 3 Aug 2017 15:05:32 -0700
Subject: Merge branch 'master' of github.com:MetaMask/metamask-extension into
 greenkeeper/initial

---
 app/scripts/inpage.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts/inpage.js')

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index ec764535e..9e98c044b 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -65,3 +65,4 @@ function restoreContextAfterImports () {
     console.warn('MetaMask - global.define could not be overwritten.')
   }
 }
+
-- 
cgit v1.2.3