resolved merge conflict

This commit is contained in:
ryleedavis 2023-07-21 11:34:14 -06:00
parent 1adc5f23a4
commit 269f47d6f4

View file

@ -2386,7 +2386,6 @@ class ThemeAssetsV3 implements IThemeAssets {
Map<Coin, String>? _coinCardImages;
late final String? coinCardImagesString;
@ignore
Map<Coin, String>? get coinCardFavoritesImages =>
_coinCardFavoritesImages ??= coinCardFavoritesImagesString == null
@ -2467,7 +2466,6 @@ class ThemeAssetsV3 implements IThemeAssets {
..backgroundRelative = json["background"] is String
? "$themeId/assets/${json["background"] as String}"
: null
..dummy1 = null
..dummy2 = null
..dummy3 = null;
}