somimar/experiment — pull request #2 by somidex (2014-03-15 08:55:16+00:00)
Title: Checking for conflict

This will test conflict handling of team.

We want to test how to handle conflicts in Git.