country.patch - removed YCP code patching

y2r supports nested functions, the patch is not needed anymore
Merge pull request #501 from lslezak/country_patch_cleanup

country.patch - removed YCP code patching (nested functions)