[glpi-data-injection/el6: 7/7] fix merge

[Remi Collet]

commit d4b86e7fd3de0bb27c19bb3360132a9b74249a18
Merge: 7fa31da 61291ae
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 30 18:27:20 2011 +0100

    fix merge

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