From 1ae97df42a1f257d626cb9dfc213ce7d47992dbf Mon Sep 17 00:00:00 2001
From: ryleedavis <rylee@cypherstack.com>
Date: Thu, 20 Apr 2023 10:12:57 -0600
Subject: [PATCH] resolve merge conflict

---
 lib/models/isar/sw_theme.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/models/isar/sw_theme.dart b/lib/models/isar/sw_theme.dart
index ceec3787f..979a98723 100644
--- a/lib/models/isar/sw_theme.dart
+++ b/lib/models/isar/sw_theme.dart
@@ -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 {