Team info

[Yasmine-Moussa]

No description provided.

[amrdraz]

there will be a conflict when you merge this branch
you must resolve the conflict before you merge do the following

$ git fetch upstream
$ git checkout yasmine
$ git merge upstream/se-2016-dmet

Then you will find a merge conflict in your team.md

remove the <<<<<< HEAD and >>>>> 123u1h1u3rn conflict tags that appear, add commit and push to your branch then comment back here again