[glpi-pdf/el6: 8/8] fix merge

[Remi Collet]

commit 76645dad37cf7f3e6d3ed908014851db5a16e0a8
Merge: 2a5e85c 1d7f5cc
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 30 18:06:01 2011 +0100

    fix merge

 .gitignore    |    1 +
 glpi-pdf.spec |   16 +++++++++++++---
 sources       |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---