Skip to content

Commit

Permalink
[fix] remove merge conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: VAmuzing <[email protected]>
  • Loading branch information
@VAmuzing
VAmuzing committed Dec 22, 2023
1 parent 125150b commit b6abbc3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b6abbc3

Please sign in to comment.