bug 930469, malformed properties file.

Remove leftover merge conflict marker