From 067e7f923a9fae04b6b8a9b2be59b05dabd15084 Mon Sep 17 00:00:00 2001
From: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Date: Wed, 10 Jan 2024 18:16:27 +0100
Subject: [PATCH] fix web after merge

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
---
 pyproject.toml                                              | 1 -
 .../user/user-settings/details/UserSettingsFlowExecutor.ts  | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index dd8179415..43b41d1c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -134,7 +134,6 @@ django-model-utils = "*"
 django-prometheus = "*"
 django-redis = "*"
 django-storages = { extras = ["s3"], version = "*" }
-# See https://github.com/django-tenants/django-tenants/pull/959
 # See https://github.com/django-tenants/django-tenants/pull/997
 django-tenants = { git = "https://github.com/rissson/django-tenants.git", branch="authentik-fixes" }
 djangorestframework = "*"
diff --git a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
index cae5ad800..40cd5bcfd 100644
--- a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
+++ b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
@@ -38,12 +38,6 @@ export class UserSettingsFlowExecutor
     @property()
     flowSlug?: string;
 
-<<<<<<< HEAD
-    @state()
-    brand?: CurrentBrand;
-
-=======
->>>>>>> main
     private _challenge?: ChallengeTypes;
 
     @property({ attribute: false })