UWMadisonUcomm/uwmadison_twitter_feed-wp — pull request #1 by bshelton229 (2013-07-23 18:46:21+00:00)
Title: Remove conflict notation.

Remove conflict notation accidentally left in the lib.