Merge pull request #618 from alpha-wallet/fix-merge

Fix: bad merge
6 years ago · 713b56c3c9
parent a224145067 d0855fce7a
commit 713b56c3c9
1 changed files with 1 additions and 1 deletions
--- a/AlphaWallet/Tokens/ViewControllers/TokensCardViewController.swift
+++ b/AlphaWallet/Tokens/ViewControllers/TokensCardViewController.swift
@ -28,7 +28,7 @@ class TokensCardViewController: UIViewController, TokenVerifiableStatusViewContr
        return tokenObject.contract
    }
    var tokenObject: TokenObject
-    var viewModel: TicketsViewModel
+    var viewModel: TokensCardViewModel
    let tokensStorage: TokensDataStore
    let account: Wallet
    let session: WalletSession