diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:55:57 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:55:57 -0400 |
commit | f96805e2322e061e088bb5725f8e1ee6006167f8 (patch) | |
tree | 888f20f86c77769e179ef5ba592cdcb4ed15910c /units/.gitignore | |
parent | acd190019d99fe25abf4515ca1834eb277161833 (diff) | |
parent | f6e7ffdf3fe8e3ed5e659f747946461350ade5a8 (diff) |
Merge branch 'parabola' into lukeshu/premove
# Conflicts:
# Makefile.am
Diffstat (limited to 'units/.gitignore')
-rw-r--r-- | units/.gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/units/.gitignore b/units/.gitignore index 2fff20a052..47e99154ee 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,4 +1,3 @@ -/systemd-bus-proxyd.service.m4 /user@.service.m4 /console-getty.service /console-getty.service.m4 @@ -23,8 +22,6 @@ /systemd-ask-password-wall.service /systemd-backlight@.service /systemd-binfmt.service -/systemd-bootchart.service -/systemd-bus-proxyd.service /systemd-coredump@.service /systemd-firstboot.service /systemd-fsck-root.service |