Skip to content

Commit fe5f32e

Browse files
TechassiTechassi
committed
fix: Remove more stuff from merge conflict
1 parent 002f0b3 commit fe5f32e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.nix‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)