hdt: fix conflict
authorErwan Velu <erwan.velu@free.fr>
Thu, 23 Apr 2009 19:23:36 +0000 (21:23 +0200)
committerErwan Velu <erwan.velu@free.fr>
Thu, 23 Apr 2009 19:23:36 +0000 (21:23 +0200)
commit645398175a19c9d0bade8dc48d20cc9d0d17b4d0
tree1df6752d6101e2eb97b5dcd202f873e6450fe31d
parent75c9aef767d9ab556c92e6e50a0ca0b61b898916
hdt: fix conflict

Impact: making build working again

A forgoten conflict
com32/hdt/hdt-cli-pci.c