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

..

contents

…

resources

Add temp nightly icon

2023-12-04 12:48:21 -05:00

src

Remove remnants from conflict resolution (#3528)

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

build.rs

…

Cargo.toml

Merge branch 'main' into feedback-2

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