diff options
| author | Hsuan Lee <boczeratul@gmail.com> | 2018-10-23 20:08:46 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-10 18:20:24 +0800 |
| commit | ed2a63a4a3cc4ece4e2535a3d2e8cf6d00b24039 (patch) | |
| tree | a60bcd34f7e5ad79b0dbadcb356bda23a00ca69e | |
| parent | 1bd092cd21bf01cc4fe1148272c7ce0d1ab86dab (diff) | |
| download | dexon-wallet-ed2a63a4a3cc4ece4e2535a3d2e8cf6d00b24039.tar.gz dexon-wallet-ed2a63a4a3cc4ece4e2535a3d2e8cf6d00b24039.tar.zst dexon-wallet-ed2a63a4a3cc4ece4e2535a3d2e8cf6d00b24039.zip | |
Resolve conflicts
| -rw-r--r-- | app/_locales/en/messages.json | 46 | ||||
| -rw-r--r-- | ui/app/components/add-token-button/index.scss | 2 |
2 files changed, 1 insertions, 47 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8e5d9e6b..129bec25 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1116,22 +1116,6 @@ "separateEachWord": { "message": "Separate each word with a single space" }, -<<<<<<< HEAD -======= - "onlySendToEtherAddress": { - "message": "Only send ETH to an DEXON address." - }, - "onlySendTokensToAccountAddress": { - "message": "Only send $1 to an DEXON account address.", - "description": "displays token symbol" - }, - "orderOneHere": { - "message": "Order a Trezor or Ledger and keep your funds in cold storage" - }, - "outgoing": { - "message": "Outgoing" - }, ->>>>>>> Complete onboarding flow "searchTokens": { "message": "Search Tokens" }, @@ -1156,36 +1140,6 @@ "settings": { "message": "Settings" }, -<<<<<<< HEAD -======= - "step1HardwareWallet": { - "message": "1. Connect Hardware Wallet" - }, - "step1HardwareWalletMsg": { - "message": "Connect your hardware wallet directly to your computer." - }, - "step2HardwareWallet": { - "message": "2. Select an Account" - }, - "step2HardwareWalletMsg": { - "message": "Select the account you want to view. You can only choose one at a time." - }, - "step3HardwareWallet": { - "message": "3. Start using dApps and more!" - }, - "step3HardwareWalletMsg": { - "message": "Use your hardware account like you would with any DEXON account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." - }, - "info": { - "message": "Info" - }, - "scanInstructions": { - "message": "Place the QR code in front of your camera" - }, - "scanQrCode": { - "message": "Scan QR Code" - }, ->>>>>>> Complete onboarding flow "shapeshiftBuy": { "message": "Buy with Shapeshift" }, diff --git a/ui/app/components/add-token-button/index.scss b/ui/app/components/add-token-button/index.scss index 39f40471..31a9ab21 100644 --- a/ui/app/components/add-token-button/index.scss +++ b/ui/app/components/add-token-button/index.scss @@ -20,7 +20,7 @@ font-size: 0.75rem; margin: 1rem; text-transform: uppercase; - color: $curious-blue; + color: $dexon-purple; cursor: pointer; } } |