Skip to content

I
InvestCustomer
Commit 6633cb75 by Giang Tran
Options

merge code

parent 7062d714
Showing with 0 additions and 4 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/routers/StackNavigation.js
...@@ -25,12 +25,8 @@ import History from '../Screens/Action/History/History'; ...@@ -25,12 +25,8 @@ import History from '../Screens/Action/History/History';
import Authen from '../Screens/Authen/Authen'; import Authen from '../Screens/Authen/Authen';
import ForgotPassWord from '../Screens/Authen/ForgotPassword'; import ForgotPassWord from '../Screens/Authen/ForgotPassword';
import ConfirmOTP from '../Screens/Authen/ConfirmOTP'; import ConfirmOTP from '../Screens/Authen/ConfirmOTP';
<<<<<<< HEAD
import ChooseMethod from '../Screens/Action/Deposit/ChooseMethod';
=======
import ConfirmEmail from '../Screens/Authen/ConfirmEmail'; import ConfirmEmail from '../Screens/Authen/ConfirmEmail';
import NewPassword from '../Screens/Authen/NewPassword'; import NewPassword from '../Screens/Authen/NewPassword';
>>>>>>> devTung-March-13
import * as ScreenName from './ScreenNames'; import * as ScreenName from './ScreenNames';
import Profile from '../Screens/Profile/Profile'; import Profile from '../Screens/Profile/Profile';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment