Accept selected changes from PR #175
This commit is contained in:
commit
3fcd83da80
3 changed files with 72 additions and 5 deletions
1
app/.gitaattributes
Normal file
1
app/.gitaattributes
Normal file
|
|
@ -0,0 +1 @@
|
|||
app/Cargo.lock merge=ours
|
||||
Loading…
Add table
Add a link
Reference in a new issue