diff options
| author | Alan Pearce | 2021-05-18 20:12:46 +0200 |
|---|---|---|
| committer | Alan Pearce | 2021-05-18 20:12:46 +0200 |
| commit | bf6df500236728a550d5072b25509520d07ea03e (patch) | |
| tree | fe556be22c0cb30086a780a3c580480be4d97893 /user/gnupg/trezor/dirmngr.conf | |
| parent | 0d60b154cc82b17fb9d3a888db3a76b913134b70 (diff) | |
| download | nixfiles-bf6df500236728a550d5072b25509520d07ea03e.tar.lz nixfiles-bf6df500236728a550d5072b25509520d07ea03e.tar.zst nixfiles-bf6df500236728a550d5072b25509520d07ea03e.zip | |
git: don't auto-merge npm lockfile conflicts
`npm install` will perform this process anyway
Diffstat (limited to 'user/gnupg/trezor/dirmngr.conf')
0 files changed, 0 insertions, 0 deletions