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

..

languages

Port to gpui2

2023-11-30 13:07:47 +02:00

app_menus.rs

Port recent_projects to Zed2 (#3525)

2023-12-06 18:41:50 -05:00

assets.rs

Exclude source themes from Zed2 binary

2023-11-03 11:11:10 -04:00

languages.rs

Add uiua and nu languages

2023-11-27 18:46:56 -08:00

main.rs

Merge branch 'main' into feedback-2

2023-12-06 23:16:54 -05:00

only_instance.rs

Disable instance handshake in dev builds

2023-12-04 09:16:04 -05:00

open_listener.rs

Implement most core actions

2023-11-14 00:06:33 -08:00

zed2.rs

Remove remnants from conflict resolution (#3528)

2023-12-06 23:44:49 -05:00