summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/Makefile
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-12-18 19:44:34 +0000
committerdamien <damien@mandriva.com>2000-12-18 19:44:34 +0000
commit478632060840a9dd32a64325d59819bd2025217a (patch)
treede0c080025c06bb413e9e562406570d4e725addf /mdk-stage1/Makefile
parentcd67553b186a4070712cf5fe6a2c76f5bb5e6552 (diff)
downloaddrakx-478632060840a9dd32a64325d59819bd2025217a.tar
drakx-478632060840a9dd32a64325d59819bd2025217a.tar.gz
drakx-478632060840a9dd32a64325d59819bd2025217a.tar.bz2
drakx-478632060840a9dd32a64325d59819bd2025217a.tar.xz
drakx-478632060840a9dd32a64325d59819bd2025217a.zip
corrected bad mergeinconf
Diffstat (limited to 'mdk-stage1/Makefile')
0 files changed, 0 insertions, 0 deletions