From 910a077d19f0fdd632fa062c2d3ff59cfc25c419 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 23 Jan 2023 09:59:01 +0000
Subject: [PATCH] Merge fix

---
 packages/bbui/src/Form/Core/Picker.svelte | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index f0b22e5cca..32cfcf3310 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -131,25 +131,17 @@
 <Popover
   anchor={button}
   align="left"
-<<<<<<< HEAD
-  portalTarget={document.documentElement}
-=======
->>>>>>> origin/develop
   bind:this={popover}
   {open}
   on:close={() => (open = false)}
   useAnchorWidth={!autoWidth}
   maxWidth={autoWidth ? 400 : null}
 >
-<<<<<<< HEAD
-  <div class="popover-content" class:auto-width={autoWidth}>
-=======
   <div
     class="popover-content"
     class:auto-width={autoWidth}
     use:clickOutside={() => (open = false)}
   >
->>>>>>> origin/develop
     {#if autocomplete}
       <Search
         value={searchTerm}