resolve merge conflict

This commit is contained in:
ryleedavis 2023-04-20 10:12:57 -06:00
parent 62a9f7f5bf
commit 1ae97df42a

View file

@ -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 {