summary refs log tree commit diff stats
path: root/user/xresources
diff options
context:
space:
mode:
authorAlan Pearce2021-05-18 20:12:46 +0200
committerAlan Pearce2021-05-18 20:12:46 +0200
commitbf6df500236728a550d5072b25509520d07ea03e (patch)
treefe556be22c0cb30086a780a3c580480be4d97893 /user/xresources
parent0d60b154cc82b17fb9d3a888db3a76b913134b70 (diff)
downloadnixfiles-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/xresources')
0 files changed, 0 insertions, 0 deletions