diff options
| author | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:23:36 +0200 |
|---|---|---|
| committer | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:23:36 +0200 |
| commit | 645398175a19c9d0bade8dc48d20cc9d0d17b4d0 (patch) | |
| tree | 1df6752d6101e2eb97b5dcd202f873e6450fe31d /com32/lib/syslinux/shuffle_rm.c | |
| parent | 75c9aef767d9ab556c92e6e50a0ca0b61b898916 (diff) | |
| download | syslinux-645398175a19c9d0bade8dc48d20cc9d0d17b4d0.tar.gz | |
hdt: fix conflict
Impact: making build working again
A forgoten conflict
Diffstat (limited to 'com32/lib/syslinux/shuffle_rm.c')
0 files changed, 0 insertions, 0 deletions