Removed bogus merge lines from localization file
Merge pull request #339 from danielhjames/v4.2

Removed bogus merge lines from localization file