[glpi-mass-ocs-import/el6: 7/7] fix merge

[Remi Collet]

commit 1efd74996d0567f5e22fc87e6cb34a4a82436f27
Merge: 637b0e1 95f0b1d
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 30 18:47:53 2011 +0100

    fix merge

 .gitignore                |    1 +
 glpi-mass-ocs-import.spec |   13 ++++++++++---
 sources                   |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---