diff options
author | Bill Nottingham <notting@redhat.com> | 2003-03-13 01:20:27 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2003-03-13 01:20:27 +0000 |
commit | fe149f46779dc2d82f3b9e79f382bb2e49ec982e (patch) | |
tree | 70ada67fbeaeaed44b024648de03964192cbd27d /adjtime | |
parent | 9e3bccf1d0671f2164510690a88e5b5d3eec2da1 (diff) | |
download | initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.gz initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.bz2 initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.xz initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.zip |
fix conflict
Diffstat (limited to 'adjtime')
0 files changed, 0 insertions, 0 deletions