mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-29 06:33:52 +03:00
Fix merge conflict
This commit is contained in:
parent
bebb528656
commit
b801e0a46e
@ -105,7 +105,7 @@ pub struct Config {
|
||||
|
||||
impl Config {
|
||||
pub fn is_development(&self) -> bool {
|
||||
self.zed_environment == "development"
|
||||
self.zed_environment == "development".into()
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user