Fixed conflict in pulp-puppet.spec
Merge pull request #147 from dkliban/2.5-testing

Fixed conflict in pulp-puppet.spec