diff options
| author | damien <damien@mandriva.com> | 2000-12-18 19:44:34 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-12-18 19:44:34 +0000 |
| commit | 478632060840a9dd32a64325d59819bd2025217a (patch) | |
| tree | de0c080025c06bb413e9e562406570d4e725addf /rescue | |
| parent | cd67553b186a4070712cf5fe6a2c76f5bb5e6552 (diff) | |
| download | drakx-478632060840a9dd32a64325d59819bd2025217a.tar drakx-478632060840a9dd32a64325d59819bd2025217a.tar.gz drakx-478632060840a9dd32a64325d59819bd2025217a.tar.bz2 drakx-478632060840a9dd32a64325d59819bd2025217a.tar.xz drakx-478632060840a9dd32a64325d59819bd2025217a.zip | |
corrected bad mergeinconf
Diffstat (limited to 'rescue')
0 files changed, 0 insertions, 0 deletions