fix issue with rebase
This commit is contained in:
parent
e371d2fe4b
commit
9947bae85a
|
@ -1,18 +1,8 @@
|
|||
import json
|
||||
import eventemitter
|
||||
import ../status/accounts as status_accounts
|
||||
|
||||
type
|
||||
GeneratedAccount* = object
|
||||
publicKey*: string
|
||||
address*: string
|
||||
id*: string
|
||||
keyUid*: string
|
||||
mnemonic*: string
|
||||
derived*: JsonNode
|
||||
username*: string
|
||||
key*: string
|
||||
identicon*: string
|
||||
import ../status/utils
|
||||
import ../status/types
|
||||
|
||||
type
|
||||
AccountModel* = ref object
|
||||
|
|
Loading…
Reference in New Issue