From 593c7a8cd17351ca840d04c039a5902ad68c1233 Mon Sep 17 00:00:00 2001
From: K Simmons <keith@zed.dev>
Date: Wed, 21 Sep 2022 16:35:24 -0700
Subject: [PATCH] fix rebase error

---
 styles/src/styleTree/contactsPopover.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/styles/src/styleTree/contactsPopover.ts b/styles/src/styleTree/contactsPopover.ts
index e9de5dddaf627120d12ab452137fbd47508771a5..585af70fbdbe01f9a452c039e21bd49c5030bfb0 100644
--- a/styles/src/styleTree/contactsPopover.ts
+++ b/styles/src/styleTree/contactsPopover.ts
@@ -1,8 +1,8 @@
-import Theme from "../themes/common/theme";
-import { backgroundColor } from "./components";
+import { ColorScheme } from "../themes/common/colorScheme";
+import { background } from "./components";
 
-export default function workspace(theme: Theme) {
+export default function workspace(colorScheme: ColorScheme) {
   return {
-    background: backgroundColor(theme, 300),
+    background: background(colorScheme.lowest.middle),
   }
 }