phonegap/phonegap — pull request #22 by bradfol (2013-01-03 23:02:23+00:00)
Title: Remove merge conflict lines from gitignore file

There are lines from a merge conflict in the gitignore file.