sabre1041/openshift-mobile — pull request #52 by ron-murhammer (2014-02-28 23:04:01+00:00)
Title: Don't need the merges directory

Don't need the merges directory as phonegap will generate this. We do need the platforms directory otherwise the build fails. Removed the /merges/.gitignore and added /merges to top level .gitignore