From 58f52b2b8de9efd43896e23ab0ac9972f45bb278 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Wed, 28 Mar 2018 13:21:53 -0700
Subject: Fix merge conflicts. Refactor onboarding flow.

---
 mascara/src/app/first-time/import-account-screen.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mascara/src/app/first-time/import-account-screen.js')

diff --git a/mascara/src/app/first-time/import-account-screen.js b/mascara/src/app/first-time/import-account-screen.js
index ab0aca0f0..fdcaa7199 100644
--- a/mascara/src/app/first-time/import-account-screen.js
+++ b/mascara/src/app/first-time/import-account-screen.js
@@ -142,6 +142,7 @@ class ImportAccountScreen extends Component {
   render () {
     const { OPTIONS } = ImportAccountScreen
     const { selectedOption } = this.state
+    console.log('RENDER IMPORT')
 
     return this.props.isLoading
       ? <LoadingScreen loadingMessage="Creating your new account" />
-- 
cgit