# Advanced-git
This repo is a workshop assignment to practice conflict resolvation in git