puzl/dotvim — pull request #1 by ocallagj (2013-09-12 14:44:27+00:00)
Title: Removed merge comments from .gitmodules

I'm just playing with Github here. You can ignore if ye want. But I think theres a problem with yer submodules file. Looks like a merge conflict got staged.