Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-25 11:45:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve merge conflict

Browse source
This commit is contained in:
ryleedavis 2023-04-20 10:12:57 -06:00
parent 62a9f7f5bf
commit 1ae97df42a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/models/isar/sw_theme.dart
View file

@ -1440,6 +1440,7 @@ class StackTheme {
required this.internalId, required this.internalId,
required this.assetBundleUrl, required this.assetBundleUrl,
required this.name, required this.name,
required this.assets,
required this.brightnessString, required this.brightnessString,
required this.backgroundInt, required this.backgroundInt,
required this.backgroundAppBarInt, required this.backgroundAppBarInt,
@ -1659,6 +1660,7 @@ class StackTheme {
return result; return result;
} }
}
@Embedded(inheritance: false) @Embedded(inheritance: false)
class ThemeAssets { class ThemeAssets {