diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
| commit | 6d17bf8726d06249097f42aa5b8fb41c345eeab8 (patch) | |
| tree | 791e92f5e63e9cfece89543fce77b515015ab96c /etc/root | |
| parent | d30d6ad00561d36a052e2a024020f6802756f04a (diff) | |
resolve conflicts
Diffstat (limited to 'etc/root')
0 files changed, 0 insertions, 0 deletions