diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-04-19 22:27:21 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-04-19 22:27:21 +0000 |
| commit | 55caef36ed1cee2e924c82cf49b3ceb17bdde910 (patch) | |
| tree | 78af86998140b242713a2c54f35bad45b4cc4449 /.gitignore | |
| parent | 13c669105ca93d28ca1a78321f07fd4ddbb445b1 (diff) | |
| parent | ee57f91413c9d01f1027eccbe01f7706c94919ac (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4b290425a..58e7377fb 100644 --- a/.gitignore +++ b/.gitignore @@ -90,6 +90,7 @@ perl/Makefile.config /misc/systemd/nix-daemon.service /misc/systemd/nix-daemon.socket +/misc/systemd/nix-daemon.conf /misc/upstart/nix-daemon.conf /src/resolve-system-dependencies/resolve-system-dependencies |