e5917ea6fc
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801 |
||
---|---|---|
.. | ||
activation | ||
boot | ||
etc | ||
upstart | ||
upstart-events |
e5917ea6fc
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801 |
||
---|---|---|
.. | ||
activation | ||
boot | ||
etc | ||
upstart | ||
upstart-events |