Yelp/pushmanager — pull request #119 by asottile (2014-09-25 17:31:42+00:00)
Title: Allow arbitrary tags that contain the string 'conflict'

Solves #118