From 37ca90a18c897beef00e9c86466ba2f368497a9b Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sun, 2 Jul 2023 03:31:13 -0700
Subject: [PATCH] Fix conflict CSS

Was accidentally adding it to a declaration that was setting min-height instead of max-height
---
 components/common/DialogContent/index.module.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/common/DialogContent/index.module.scss b/components/common/DialogContent/index.module.scss
index 83050529..375acb76 100644
--- a/components/common/DialogContent/index.module.scss
+++ b/components/common/DialogContent/index.module.scss
@@ -80,8 +80,11 @@
       }
     }
 
-    &.editParty,
     &.conflict {
+      max-height: 80vh;
+    }
+
+    &.editParty {
       min-height: 80vh;
 
       .container {