Fix merge conflict

Conrad Irwin created 2 years ago

Change summary

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

Detailed changes

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()
     }
 }