zed/crates/editor2
Joseph T. Lyons 2a68a6171a
Remove remnants from conflict resolution (#3528)
Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
2023-12-06 23:44:49 -05:00
..
src Remove remnants from conflict resolution (#3528) 2023-12-06 23:44:49 -05:00
Cargo.toml WIP 2023-11-13 15:53:04 -08:00