meta: ignore flake.lock when merging in changes
This commit is contained in:
parent
9193cec295
commit
745975409d
2 changed files with 2 additions and 0 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
flake.lock merge=ignore
|
Loading…
Add table
Add a link
Reference in a new issue