summaryrefslogtreecommitdiff
path: root/etc/rc
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2009-01-09 12:15:53 +0000
committerDamien Miller <djm@cvs.openbsd.org>2009-01-09 12:15:53 +0000
commit6d17bf8726d06249097f42aa5b8fb41c345eeab8 (patch)
tree791e92f5e63e9cfece89543fce77b515015ab96c /etc/rc
parentd30d6ad00561d36a052e2a024020f6802756f04a (diff)
resolve conflicts
Diffstat (limited to 'etc/rc')
0 files changed, 0 insertions, 0 deletions