gitlabhq/testme — pull request #3 by cirosantilli (2014-07-07 19:04:12+00:00)
Title: Test merge request conflicts 1.

Commit to test merge requests conflicts.

If this is merged, we can modify our development seeds to create a merge request with conflicts automatically.

DO NOT MERGE THIS DIRECTLY. Create it on branch `merge-request1` and then delete this PR.

The conflict will be with the branch proposed at: https://github.com/gitlabhq/testme/pull/2