mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-11-17 09:47:37 +00:00
resolve merge conflict
This commit is contained in:
parent
62a9f7f5bf
commit
1ae97df42a
1 changed files with 2 additions and 0 deletions
|
@ -1440,6 +1440,7 @@ class StackTheme {
|
|||
required this.internalId,
|
||||
required this.assetBundleUrl,
|
||||
required this.name,
|
||||
required this.assets,
|
||||
required this.brightnessString,
|
||||
required this.backgroundInt,
|
||||
required this.backgroundAppBarInt,
|
||||
|
@ -1659,6 +1660,7 @@ class StackTheme {
|
|||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@Embedded(inheritance: false)
|
||||
class ThemeAssets {
|
||||
|
|
Loading…
Reference in a new issue