/git_training_with_conflicts

git_training

Welcome to the git 4 G33ks training session!