diff options
author | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
commit | be3f8dec8e24f1034e5c940ab217e85834b2f544 (patch) | |
tree | 438bf5b87e7c06b5f0ffdecd6f6c1ecfd774167c /mdk-stage1/pcmcia/cardmgr.c | |
parent | fac72835e8f1160bc931025763f1c1924a899046 (diff) | |
download | drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.gz drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.bz2 drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.xz drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.zip |
fix mismerge
Diffstat (limited to 'mdk-stage1/pcmcia/cardmgr.c')
0 files changed, 0 insertions, 0 deletions