From 447523a4b8a227ac34003f4a5bd4f952272d2d42 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 23 Aug 2023 16:24:42 +0100
Subject: [PATCH] Merge

---
 .../design/[screenId]/[componentId]/_layout.svelte              | 2 +-
 packages/pro                                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
index 03a0aad9ba..19cb1d8dff 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
@@ -6,7 +6,7 @@
   import { findComponent } from "builderStore/componentUtils"
   import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
   import NavigationPanel from "./_components/Navigation/index.svelte"
-  import ScreenSettingsPanel from "./_components/Screen/SettingsPanel.svelte"
+  import ScreenSettingsPanel from "./_components/Screen/index.svelte"
 
   $: componentId = $store.selectedComponentId
   $: store.actions.websocket.selectResource(componentId)
diff --git a/packages/pro b/packages/pro
index 9c564edb37..06a28b18a4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 9c564edb37cb619cb5971e10c4317fa6e7c5bb00
+Subproject commit 06a28b18a409cc12e9e8a5b69a094adcc6babd5a