gitlabhq/testme — pull request #4 by cirosantilli (2014-07-08 09:50:29+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.

This should consist of 2 commits as it currently is: one to set the stage, the second to diverge.

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