From b801e0a46eb58889f652ad13ab614be80f1ef39c Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 9 Jan 2024 09:44:22 -0700
Subject: [PATCH] Fix merge conflict

---
 crates/collab/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/collab/src/lib.rs b/crates/collab/src/lib.rs
index 87a423bea9..aba9bd75d1 100644
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -105,7 +105,7 @@ pub struct Config {
 
 impl Config {
     pub fn is_development(&self) -> bool {
-        self.zed_environment == "development"
+        self.zed_environment == "development".into()
     }
 }