gitlabhq/gitlab-ci — pull request #391 by cirosantilli (2014-03-07 15:55:14+00:00)
Title: Organize gitignore.

- sort alphabetically
- remove the <<<<<<< HEAD merge artifact