gitlabhq/gitlabhq — pull request #7081 by cirosantilli (2014-06-05 13:11:29+00:00)
Title: Remove conflict artifact.

`git grepped` for any other artifacts, nothing left. My bad.