mozilla-b2g/gaia — pull request #13066 by Pike (2013-10-24 12:22:15+00:00)
Title: bug 930469, malformed properties file.

Remove leftover merge conflict marker