bug 930469, malformed properties file.
Remove leftover merge conflict marker
Merge pull request #13066 from Pike/bug-930469-malformed-properties

bug 930469, malformed properties file.