sunlightlabs/openstates — pull request #457 by mertonium (2012-12-06 00:33:42+00:00)
Title: Remove merge conflict tokens from .gitignore

I just noticed the remnants of a git merge conflict in this file, so I removed them.

I assume that both "+*.sublime*" and "openstates.sqlite3" are patterns we'd like to leave in.