resolved conflict in yast2-packager.spec
Merge pull request #32 from yast/conflict_fix

resolved conflict in yast2-packager.spec