# Conflicts: # Cargo.lock # crates/settings_content/src/settings_content.rs # crates/zed/Cargo.toml # script/bundle-linux