Resolve merge conflict.

1 files changed, 18 insertions, 1 deletions

diff --git a/ui-dev.js b/ui-dev.js
index 7498ff8ea..a86fa7392 100644
--- a/ui-dev.js
+++ b/ui-dev.js
@@ -1,3 +1,20 @@
+/* UI DEV
+ *
+ * This is a utility module.
+ * It initializes a minimalist browserifiable project
+ * that contains the Metamask UI, with a mocked state.
+ *
+ * Includes a state menu for switching between different
+ * mocked states, along with query param support,
+ * so those states are preserved when live-reloading.
+ *
+ * This is a convenient way to develop on the UI
+ * without having to re-enter your password
+ * every time the plugin rebuilds.
+ *
+ * To use, run `npm run ui`.
+ */
+
 const render = require('react-dom').render
 const h = require('react-hyperscript')
 const Root = require('./ui/app/root')
@@ -54,7 +71,7 @@ render(
       style: {
         height: '500px',
         width: '360px',
-        boxShadow: '2px 2px 5px grey',
+        boxShadow: 'grey 0px 2px 9px',
         margin: '20px',
       },
     }, [