Removed merge conflict artifact from jQuery Mobile theme file.
Merge pull request #1950 from pjackson28/master

Removed merge conflict artifact from jQuery Mobile theme file